diff --git a/hw/vhost.c b/hw/vhost.c
index 1e5bc69a7e..ad2f98a8a3 100644
--- a/hw/vhost.c
+++ b/hw/vhost.c
@@ -357,9 +357,9 @@ static int vhost_virtqueue_set_addr(struct vhost_dev *dev,
 {
     struct vhost_vring_addr addr = {
         .index = idx,
-        .desc_user_addr = (u_int64_t)(unsigned long)vq->desc,
-        .avail_user_addr = (u_int64_t)(unsigned long)vq->avail,
-        .used_user_addr = (u_int64_t)(unsigned long)vq->used,
+        .desc_user_addr = (uint64_t)(unsigned long)vq->desc,
+        .avail_user_addr = (uint64_t)(unsigned long)vq->avail,
+        .used_user_addr = (uint64_t)(unsigned long)vq->used,
         .log_guest_addr = vq->used_phys,
         .flags = enable_log ? (1 << VHOST_VRING_F_LOG) : 0,
     };
diff --git a/hw/virtio.c b/hw/virtio.c
index f54129f658..e7657ae8aa 100644
--- a/hw/virtio.c
+++ b/hw/virtio.c
@@ -773,7 +773,7 @@ target_phys_addr_t virtio_queue_get_desc_size(VirtIODevice *vdev, int n)
 target_phys_addr_t virtio_queue_get_avail_size(VirtIODevice *vdev, int n)
 {
     return offsetof(VRingAvail, ring) +
-        sizeof(u_int64_t) * vdev->vq[n].vring.num;
+        sizeof(uint64_t) * vdev->vq[n].vring.num;
 }
 
 target_phys_addr_t virtio_queue_get_used_size(VirtIODevice *vdev, int n)