diff --git a/libap/ap.c b/libap/ap.c
index 5c2f406d..6a2aa746 100644
--- a/libap/ap.c
+++ b/libap/ap.c
@@ -692,7 +692,7 @@ void ap_mask_to_list(char *mask, struct util_list *list)
  */
 void ap_list_remove_all(struct util_list *list)
 {
-	struct ap_node *node;
+	struct vfio_ap_node *node;
 
 	while (!util_list_is_empty(list)) {
 		node = util_list_start(list);
diff --git a/zdev/include/ap.h b/zdev/include/ap.h
index f485db24..ea44fcb2 100644
--- a/zdev/include/ap.h
+++ b/zdev/include/ap.h
@@ -24,11 +24,6 @@ extern struct devtype ap_devtype;
 extern struct subtype ap_subtype;
 extern struct namespace ap_namespace;
 
-struct ap_node {
-	struct util_list_node node;
-	unsigned int id;
-};
-
 struct mdev_cb_data {
 	struct util_list *adapters;
 	struct util_list *domains;
diff --git a/zdev/src/ap.c b/zdev/src/ap.c
index f22bea2c..0c15b3fb 100644
--- a/zdev/src/ap.c
+++ b/zdev/src/ap.c
@@ -53,18 +53,18 @@ static void ap_mask_list_changes(const char *source, const char *target,
 				 struct util_list *adds, struct util_list *subs)
 {
 	int i;
-	struct ap_node *node;
+	struct vfio_ap_node *node;
 
 	for (i = 0; i <= AP_MAX_MASK_VALUE; i++) {
 		if (ap_test_bit(i, source)) {
 			if (!ap_test_bit(i, target)) {
-				node = misc_malloc(sizeof(struct ap_node));
+				node = misc_malloc(sizeof(struct vfio_ap_node));
 				node->id = i;
 				util_list_add_tail(subs, node);
 			}
 		} else {
 			if (ap_test_bit(i, target)) {
-				node = misc_malloc(sizeof(struct ap_node));
+				node = misc_malloc(sizeof(struct vfio_ap_node));
 				node->id = i;
 				util_list_add_tail(adds, node);
 			}
@@ -210,7 +210,7 @@ static bool ap_validate_mask_input(char *mask, const char *input,
 	 * Translate the mask value into a list of additions/removals for later
 	 * conflict analysis.
 	 */
-	util_list_init(adds, struct ap_node, node);
+	util_list_init(adds, struct vfio_ap_node, node);
 	ap_mask_list_changes(mask, newmask, adds, subs);
 	strcpy(mask, newmask);
 	goto out;
@@ -948,8 +948,8 @@ static exit_code_t ap_check_mask_changes(config_t config,
 	struct util_list all_ap;
 	struct util_list all_aq;
 
-	util_list_init(&all_ap, struct ap_node, node);
-	util_list_init(&all_aq, struct ap_node, node);
+	util_list_init(&all_ap, struct vfio_ap_node, node);
+	util_list_init(&all_aq, struct vfio_ap_node, node);
 
 	/* Validate the mask changes against existing vfio-ap devices */
 	if (SCOPE_ACTIVE(config) && (!util_list_is_empty(add_ap) ||
@@ -996,14 +996,14 @@ static exit_code_t ap_devtype_write_settings(struct devtype *dt,
 	exit_code_t rc = EXIT_OK;
 	/* No kernel or module parameters exist for AP device driver. */
 
-	util_list_init(&add_ap, struct ap_node, node);
-	util_list_init(&add_aq, struct ap_node, node);
-	util_list_init(&sub_ap, struct ap_node, node);
-	util_list_init(&sub_aq, struct ap_node, node);
-	util_list_init(&add_p_ap, struct ap_node, node);
-	util_list_init(&add_p_aq, struct ap_node, node);
-	util_list_init(&sub_p_ap, struct ap_node, node);
-	util_list_init(&sub_p_aq, struct ap_node, node);
+	util_list_init(&add_ap, struct vfio_ap_node, node);
+	util_list_init(&add_aq, struct vfio_ap_node, node);
+	util_list_init(&sub_ap, struct vfio_ap_node, node);
+	util_list_init(&sub_aq, struct vfio_ap_node, node);
+	util_list_init(&add_p_ap, struct vfio_ap_node, node);
+	util_list_init(&add_p_aq, struct vfio_ap_node, node);
+	util_list_init(&sub_p_ap, struct vfio_ap_node, node);
+	util_list_init(&sub_p_aq, struct vfio_ap_node, node);
 	write_ap = write_aq = write_udev = false;
 
 	rc = ap_get_lock();