diff --git a/pimd/pim_iface.h b/pimd/pim_iface.h
index 9213e600f9..65dde45782 100644
--- a/pimd/pim_iface.h
+++ b/pimd/pim_iface.h
@@ -32,6 +32,7 @@
 #include "pim_upstream.h"
 #include "pim_instance.h"
 #include "bfd.h"
+#include "pim_str.h"
 
 #define PIM_IF_MASK_PIM                             (1 << 0)
 #define PIM_IF_MASK_IGMP                            (1 << 1)
@@ -76,7 +77,7 @@
 #define PIM_IF_FLAG_UNSET_HELLO_SENT(flags) ((flags) &= ~PIM_IF_FLAG_HELLO_SENT)
 
 struct pim_iface_upstream_switch {
-	struct in_addr address;
+	pim_addr address;
 	struct list *us;
 };
 
diff --git a/pimd/pim_igmp.h b/pimd/pim_igmp.h
index 5fd4fdb32c..2a818c068b 100644
--- a/pimd/pim_igmp.h
+++ b/pimd/pim_igmp.h
@@ -93,7 +93,7 @@ struct gm_sock {
 	struct thread
 		*t_igmp_query_timer; /* timer: issue IGMP general queries */
 	struct thread *t_other_querier_timer; /* timer: other querier present */
-	struct in_addr querier_addr;	  /* IP address of the querier */
+	pim_addr querier_addr;	 /* IP address of the querier */
 	int querier_query_interval;	   /* QQI */
 	int querier_robustness_variable; /* QRV */
 	int startup_query_count;