diff --git a/bin/if.c b/bin/if.c
index 6298828..be3529e 100644
--- a/bin/if.c
+++ b/bin/if.c
@@ -4,6 +4,9 @@
 #include <string.h>
 #include <errno.h>
 
+#include <patty/ax25.h>
+#include <patty/ax25/aprs_is.h>
+#include <patty/kiss/tnc.h>
 #include <patty/bin/if.h>
 
 struct context {
diff --git a/include/patty/ax25.h b/include/patty/ax25.h
index 04d79c7..86326bb 100644
--- a/include/patty/ax25.h
+++ b/include/patty/ax25.h
@@ -103,8 +103,6 @@ typedef struct _patty_ax25_if patty_ax25_if;
 #include <patty/client.h>
 #include <patty/ax25/frame.h>
 #include <patty/ax25/if.h>
-#include <patty/kiss/tnc.h>
-#include <patty/ax25/aprs_is.h>
 #include <patty/ax25/route.h>
 #include <patty/ax25/sock.h>
 #include <patty/ax25/server.h>
diff --git a/include/patty/ax25/if.h b/include/patty/ax25/if.h
index 9ebe0b8..876c86a 100644
--- a/include/patty/ax25/if.h
+++ b/include/patty/ax25/if.h
@@ -4,8 +4,6 @@
 #include <stdint.h>
 #include <sys/types.h>
 
-#include <patty/list.h>
-
 #define PATTY_AX25_IF_DEFAULT_CLASSES \
     (PATTY_AX25_PARAM_CLASSES_HALF_DUPLEX)
 
diff --git a/include/patty/bin/if.h b/include/patty/bin/if.h
index 75cd254..3465114 100644
--- a/include/patty/bin/if.h
+++ b/include/patty/bin/if.h
@@ -1,7 +1,7 @@
 #ifndef _PATTY_BIN_IF_H
 #define _PATTY_BIN_IF_H
 
-#include <patty/ax25.h>
+#include <patty/ax25/if.h>
 #include <patty/error.h>
 
 patty_ax25_if *patty_bin_if_create(int argc,
diff --git a/src/aprs_is.c b/src/aprs_is.c
index dd70132..c6e6895 100644
--- a/src/aprs_is.c
+++ b/src/aprs_is.c
@@ -9,6 +9,7 @@
 #include <sys/socket.h>
 
 #include <patty/ax25.h>
+#include <patty/ax25/aprs_is.h>
 
 enum state {
     APRS_IS_HEADER,
diff --git a/src/server.c b/src/server.c
index b7ba7b3..43e4a3a 100644
--- a/src/server.c
+++ b/src/server.c
@@ -11,6 +11,7 @@
 #include <errno.h>
 
 #include <patty/ax25.h>
+#include <patty/kiss/tnc.h>
 #include <patty/hash.h>
 
 typedef int (*patty_ax25_server_call)(patty_ax25_server *, int);
diff --git a/src/tnc.c b/src/tnc.c
index 10886c5..d11b58d 100644
--- a/src/tnc.c
+++ b/src/tnc.c
@@ -13,6 +13,7 @@
 
 #include <patty/ax25.h>
 #include <patty/kiss.h>
+#include <patty/kiss/tnc.h>
 
 #include "config.h"