diff --git a/include/patty/ax25.h b/include/patty/ax25.h
index 282521b..ef681dc 100644
--- a/include/patty/ax25.h
+++ b/include/patty/ax25.h
@@ -5,10 +5,12 @@
 #include <sys/types.h>
 
 #include <patty/kiss.h>
+#include <patty/list.h>
 #include <patty/dict.h>
 
 #include <patty/ax25/macros.h>
 #include <patty/ax25/proto.h>
+#include <patty/ax25/address.h>
 #include <patty/ax25/frame.h>
 
 #define PATTY_AX25_IF_OPT_TYPE_MASK 0x1f
@@ -44,10 +46,11 @@ typedef struct _patty_ax25_if {
     enum patty_ax25_if_type type;
     patty_kiss_tnc *        tnc;
     patty_ax25_stats        stats;
-    patty_dict *            ports;
+    patty_list *            addresses;
 } patty_ax25_if;
 
 typedef struct _patty_ax25_link {
+    enum patty_ax25_if_type type;
     patty_ax25_if *    iface;
     patty_ax25_port  * local;
     patty_ax25_port  * remote;
diff --git a/include/patty/ax25/frame.h b/include/patty/ax25/frame.h
index 05e75c3..34b50a1 100644
--- a/include/patty/ax25/frame.h
+++ b/include/patty/ax25/frame.h
@@ -16,18 +16,6 @@ enum patty_ax25_frame_cr {
     PATTY_AX25_FRAME_RESPONSE
 };
 
-typedef struct _patty_ax25_address {
-    char callsign[7];
-
-    int ssid;
-    int last;
-
-    union {
-        int c;
-        int repeated;
-    };
-} patty_ax25_address;
-
 typedef struct _patty_ax25_frame {
     patty_ax25_address dest;
     patty_ax25_address src;
diff --git a/src/Makefile b/src/Makefile
index 169a040..96d5288 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -8,9 +8,9 @@ CFLAGS		= $(CGFLAGS) -fPIC -Wall -O2 -I$(INCLUDE_PATH)
 LDFLAGS		=
 
 HEADERS		= kiss.h ax25.h ax25/macros.h ax25/proto.h ax25/frame.h \
-		  hash.h dict.h
+		  list.h hash.h dict.h
 
-OBJS		= kiss.o ax25.o frame.o hash.o dict.o test.o
+OBJS		= kiss.o ax25.o frame.o list.o hash.o dict.o test.o
 
 PROGRAM		= test