--- cmdparse.c.orig	2013-09-07 11:09:55.661857059 -0700
+++ cmdparse.c	2013-09-07 10:57:50.556054240 -0700
@@ -4,8 +4,8 @@
 
 
 #include <sys/socket.h>
-#include <netax25/kernel_ax25.h>
-#include <netax25/kernel_rose.h>
+#include <netax25/ax25.h>
+#include <netrose/rose.h>
 #include <netax25/axlib.h>
 
 #include "node.h"
--- command.c.orig	2013-09-07 11:09:55.661857059 -0700
+++ command.c	2013-09-07 10:59:59.436086479 -0700
@@ -9,8 +9,8 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/socket.h>
-#include <netax25/kernel_ax25.h>
-#include <netax25/kernel_rose.h>
+#include <netax25/ax25.h>
+#include <netrose/rose.h>
 #include <netinet/in.h>
 #include <netdb.h>
 #include <arpa/inet.h>
--- config.c.orig	2013-09-07 11:09:55.661857059 -0700
+++ config.c	2013-09-07 11:01:29.539807920 -0700
@@ -6,8 +6,8 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <pwd.h>
-#include <netax25/kernel_ax25.h>			/* axutils.h needs this...	*/
-#include <netax25/kernel_rose.h>
+#include <netax25/ax25.h>			/* axutils.h needs this...	*/
+#include <netrose/rose.h>
 #include <netax25/axlib.h>
 #include <netax25/axconfig.h>
 
--- extcmd.c.orig	2013-09-07 11:09:55.661857059 -0700
+++ extcmd.c	2013-09-07 11:01:47.387950804 -0700
@@ -8,8 +8,8 @@
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <netax25/kernel_ax25.h>
-#include <netax25/kernel_rose.h>
+#include <netax25/ax25.h>
+#include <netrose/rose.h>
 #include <grp.h>
 #include <sys/wait.h>
 #include <netax25/axlib.h>
--- flexd.c.orig	2013-09-07 11:09:55.661857059 -0700
+++ flexd.c	2013-09-07 11:02:41.540384282 -0700
@@ -10,8 +10,8 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 
-#include <netax25/kernel_ax25.h>
-#include <netax25/kernel_rose.h>
+#include <netax25/ax25.h>
+#include <netrose/rose.h>
 #include <netinet/ip_icmp.h>
 #include <netinet/ip.h>
 
--- gateway.c.orig	2013-09-07 11:09:55.661857059 -0700
+++ gateway.c	2013-09-07 11:03:05.700577658 -0700
@@ -13,8 +13,8 @@
 #include <netdb.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <netax25/kernel_ax25.h>
-#include <netax25/kernel_rose.h>
+#include <netax25/ax25.h>
+#include <netrose/rose.h>
 #include <netinet/ip_icmp.h>
 #include <netinet/ip.h>
 
--- ipc.c.orig	2013-09-07 11:09:55.661857059 -0700
+++ ipc.c	2013-09-07 11:03:27.643753278 -0700
@@ -10,8 +10,8 @@
 #include <errno.h>
 #include <stdio.h>
 
-#include <netax25/kernel_ax25.h>
-#include <netax25/kernel_rose.h>
+#include <netax25/ax25.h>
+#include <netrose/rose.h>
 #include <netax25/axlib.h>
 #include <netax25/axconfig.h>
 #include <netax25/nrconfig.h>
--- mheard.c.orig	2013-09-07 11:09:55.661857059 -0700
+++ mheard.c	2013-09-07 11:03:43.115877101 -0700
@@ -7,8 +7,8 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 
-#include <netax25/kernel_ax25.h>
-#include <netax25/kernel_rose.h>
+#include <netax25/ax25.h>
+#include <netrose/rose.h>
 
 #include <netax25/axlib.h>
 #include <netax25/axconfig.h>
--- node.c.orig	2013-09-07 11:09:55.661857059 -0700
+++ node.c	2013-09-07 11:03:56.891987347 -0700
@@ -9,8 +9,8 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include <netax25/kernel_ax25.h>
-#include <netax25/kernel_rose.h>
+#include <netax25/ax25.h>
+#include <netrose/rose.h>
 #include <netax25/axlib.h>
 #include <netax25/axconfig.h>
 #include <netax25/nrconfig.h>
--- nodeusers.c.orig	2013-09-07 11:09:55.661857059 -0700
+++ nodeusers.c	2013-09-07 11:04:14.348127037 -0700
@@ -8,8 +8,8 @@
 #include <sys/socket.h>
 #include <signal.h>
 #include <syslog.h>
-#include <netax25/kernel_ax25.h>
-#include <netax25/kernel_rose.h>
+#include <netax25/ax25.h>
+#include <netrose/rose.h>
 #include <netax25/axlib.h>
 #include <netax25/procutils.h>
 
--- procinfo.c.orig	2013-09-07 11:09:55.661857059 -0700
+++ procinfo.c	2013-09-07 11:05:01.061500820 -0700
@@ -3,8 +3,8 @@
 #include <errno.h>
 #include <string.h>
 
-#include <netax25/kernel_ax25.h>
-#include <netax25/kernel_rose.h>
+#include <netax25/ax25.h>
+#include <netrose/rose.h>
 #include <netax25/axlib.h>
 #include <netax25/axconfig.h>
 #include <netax25/mheard.h>
--- router.c.orig	2013-09-07 11:09:55.661857059 -0700
+++ router.c	2013-09-07 11:05:16.413623653 -0700
@@ -10,8 +10,8 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 
-#include <netax25/kernel_ax25.h>
-#include <netax25/kernel_rose.h>
+#include <netax25/ax25.h>
+#include <netrose/rose.h>
 
 #include <netax25/axlib.h>
 #include <netax25/axconfig.h>
--- system.c.orig	2013-09-07 11:09:55.662857067 -0700
+++ system.c	2013-09-07 11:05:36.932787818 -0700
@@ -24,8 +24,8 @@
 #include <unistd.h>
 
 #include "md2.c"
-#include <netax25/kernel_ax25.h>
-#include <netax25/kernel_rose.h>
+#include <netax25/ax25.h>
+#include <netrose/rose.h>
 #include <netax25/axlib.h>
 #include <netax25/axconfig.h>
 
--- util.c.orig	2013-09-07 11:09:55.662857067 -0700
+++ util.c	2013-09-07 11:05:52.556912815 -0700
@@ -8,8 +8,8 @@
 #include <sys/file.h>
 
 #include <sys/socket.h>
-#include <netax25/kernel_ax25.h>
-#include <netax25/kernel_rose.h>
+#include <netax25/ax25.h>
+#include <netrose/rose.h>
 #include <netax25/axlib.h>
 
 #include "node.h"