diff --git a/include/patty/ax25.h b/include/patty/ax25.h
index f203591..2ed9515 100644
--- a/include/patty/ax25.h
+++ b/include/patty/ax25.h
@@ -1,8 +1,39 @@
 #ifndef _PATTY_AX25_H
 #define _PATTY_AX25_H
 
+#include <stdint.h>
+#include <sys/types.h>
+
+#include <patty/kiss.h>
+#include <patty/dict.h>
+
 #include <patty/ax25/macros.h>
 #include <patty/ax25/proto.h>
 #include <patty/ax25/frame.h>
 
-#endif /* _PATTY_AX25_H */
+typedef struct _patty_ax25_stats {
+    size_t frame_tx;
+    size_t frame_rx;
+    size_t frame_drop;
+} patty_ax25_stats;
+
+typedef struct _patty_ax25_address patty_ax25_port;
+
+typedef struct _patty_ax25_if {
+    patty_kiss_tnc * tnc;
+    patty_ax25_stats stats;
+} patty_ax25_if;
+
+typedef struct _patty_ax25_link {
+    patty_ax25_port  local;
+    patty_ax25_port  remote;
+    patty_ax25_stats stats;
+} patty_ax25_link;
+
+typedef struct _patty_ax25 {
+    patty_dict * ax25_ifs;
+    patty_dict * ports;
+    patty_dict * 
+} patty_ax25;
+
+#endif /* _PATTY_AX25_IF */
diff --git a/include/patty/ax25/if.h b/include/patty/ax25/if.h
deleted file mode 100644
index 16356dc..0000000
--- a/include/patty/ax25/if.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifndef _PATTY_AX25_IF
-#define _PATTY_AX25_IF
-
-#include <stdint.h>
-#include <sys/types.h>
-
-#include <patty/kiss.h>
-#include <patty/dict.h>
-
-typedef struct _patty_ax25_if_stats {
-    size_t frame_tx;
-    size_t frame_rx;
-    size_t frame_drop;
-} patty_ax25_if_stats;
-
-typedef struct _patty_ax25_if_port {
-    patty_ax25_address  address;
-    patty_ax25_if_stats stats;
-} patty_ax25_if_port;
-
-typedef struct _patty_ax25_if_link {
-    patty_ax25_if_port local;
-    patty_ax25_if_port remote;
-} patty_ax25_if_link;
-
-typedef struct _patty_ax25_if {
-    patty_dict *        ports;
-    patty_kiss_tnc *    tnc;
-    patty_ax25_if_stats stats;
-} patty_ax25_if;
-
-#endif /* _PATTY_AX25_IF */