diff --git a/net/netdude/files/patch-nd_arp.h b/net/netdude/files/patch-nd_arp.h
deleted file mode 100644
index 4c5c4f23784f..000000000000
--- a/net/netdude/files/patch-nd_arp.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- protocols/arp/nd_arp.h.orig	Sat Oct 12 00:17:24 2002
-+++ protocols/arp/nd_arp.h	Sat Oct 12 00:17:38 2002
-@@ -26,6 +26,7 @@
- #ifndef __nd_arp_h
- #define __nd_arp_h
- 
-+#include <sys/socket.h>
- #include <net/ethernet.h>
- #include <net/if_arp.h>
- 
diff --git a/net/netdude/files/patch-nd_fddi.h b/net/netdude/files/patch-nd_fddi.h
deleted file mode 100644
index 2f01d6c02d8d..000000000000
--- a/net/netdude/files/patch-nd_fddi.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- protocols/fddi/nd_fddi.h.orig	Sat Oct 12 00:25:59 2002
-+++ protocols/fddi/nd_fddi.h	Sat Oct 12 00:26:10 2002
-@@ -26,7 +26,7 @@
- #ifndef __nd_fddi_h
- #define __nd_fddi_h
- 
--#include <netinet/if_fddi.h>
-+#include <net/fddi.h>
- 
- #include <netdude/nd_gettext.h>
- #include <netdude/nd_packet.h>
diff --git a/net/netdude/files/patch-nd_fddi_callbacks.c b/net/netdude/files/patch-nd_fddi_callbacks.c
deleted file mode 100644
index 95a7a0d27c9e..000000000000
--- a/net/netdude/files/patch-nd_fddi_callbacks.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- protocols/fddi/nd_fddi_callbacks.c.orig	Sat Oct 12 00:29:27 2002
-+++ protocols/fddi/nd_fddi_callbacks.c	Sat Oct 12 00:33:10 2002
-@@ -22,8 +22,6 @@
- CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- 
- */
--#include <netinet/if_fddi.h>
--
- #include <netdude/nd_debug.h>
- #include <netdude/nd_macros.h>
- #include <netdude/nd_gui.h>
-@@ -73,7 +71,7 @@
-       if (!fh)
- 	continue;
- 
--      memcpy(fh->fddi_dhost, address, FDDI_K_ALEN);
-+      memcpy(fh->fddi_dhost, address, FDDI_ADDR_LEN);
-       nd_packet_modified_at_index(nd_pit_get(&pit), nd_pit_get_index(&pit));
-     }
-   
-@@ -119,7 +117,7 @@
-       if (!fh)
- 	continue;
- 
--      memcpy(fh->fddi_shost, address, FDDI_K_ALEN);
-+      memcpy(fh->fddi_shost, address, FDDI_ADDR_LEN);
-       nd_packet_modified_at_index(nd_pit_get(&pit), nd_pit_get_index(&pit));
-     }
-   
diff --git a/net/netdude/files/patch-nd_arp.c b/net/netdude/files/patch-protocols-arp::nd_arp.c
similarity index 100%
rename from net/netdude/files/patch-nd_arp.c
rename to net/netdude/files/patch-protocols-arp::nd_arp.c
diff --git a/net/netdude/files/patch-protocols-arp::nd_arp.h b/net/netdude/files/patch-protocols-arp::nd_arp.h
new file mode 100644
index 000000000000..f35421e24833
--- /dev/null
+++ b/net/netdude/files/patch-protocols-arp::nd_arp.h
@@ -0,0 +1,11 @@
+--- protocols/arp/nd_arp.h.orig	Wed Nov 20 20:57:00 2002
++++ protocols/arp/nd_arp.h	Wed Nov 20 20:57:26 2002
+@@ -26,6 +26,8 @@
+ #ifndef __nd_arp_h
+ #define __nd_arp_h
+ 
++#include <sys/types.h>
++#include <sys/socket.h>
+ #include <net/ethernet.h>
+ #include <net/if_arp.h>
+ 
diff --git a/net/netdude/files/patch-nd_ether.c b/net/netdude/files/patch-protocols-ether::nd_ether.c
similarity index 100%
rename from net/netdude/files/patch-nd_ether.c
rename to net/netdude/files/patch-protocols-ether::nd_ether.c
diff --git a/net/netdude/files/patch-nd_ether_callbacks.c b/net/netdude/files/patch-protocols-ether::nd_ether_callbacks.c
similarity index 100%
rename from net/netdude/files/patch-nd_ether_callbacks.c
rename to net/netdude/files/patch-protocols-ether::nd_ether_callbacks.c
diff --git a/net/netdude/files/patch-protocols-fddi::nd_fddi_callbacks.c b/net/netdude/files/patch-protocols-fddi::nd_fddi_callbacks.c
new file mode 100644
index 000000000000..deccca6b52cb
--- /dev/null
+++ b/net/netdude/files/patch-protocols-fddi::nd_fddi_callbacks.c
@@ -0,0 +1,12 @@
+--- protocols/fddi/nd_fddi_callbacks.c.orig	Wed Nov 20 21:37:07 2002
++++ protocols/fddi/nd_fddi_callbacks.c	Wed Nov 20 21:38:04 2002
+@@ -22,7 +22,9 @@
+ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ 
+ */
++#include <sys/types.h>
+ #include <netinet/if_fddi.h>
++#define FDDI_K_ALEN	6
+ 
+ #include <netdude/nd_debug.h>
+ #include <netdude/nd_macros.h>
diff --git a/net/netdude/files/patch-nd_icmp.c b/net/netdude/files/patch-protocols-icmp::nd_icmp.c
similarity index 100%
rename from net/netdude/files/patch-nd_icmp.c
rename to net/netdude/files/patch-protocols-icmp::nd_icmp.c
diff --git a/net/netdude/files/patch-nd_icmp.h b/net/netdude/files/patch-protocols-icmp::nd_icmp.h
similarity index 100%
rename from net/netdude/files/patch-nd_icmp.h
rename to net/netdude/files/patch-protocols-icmp::nd_icmp.h
diff --git a/net/netdude/files/patch-nd_icmp_callbacks.c b/net/netdude/files/patch-protocols-icmp::nd_icmp_callbacks.c
similarity index 100%
rename from net/netdude/files/patch-nd_icmp_callbacks.c
rename to net/netdude/files/patch-protocols-icmp::nd_icmp_callbacks.c
diff --git a/net/netdude/files/patch-nd_ip.c b/net/netdude/files/patch-protocols-ip::nd_ip.c
similarity index 100%
rename from net/netdude/files/patch-nd_ip.c
rename to net/netdude/files/patch-protocols-ip::nd_ip.c
diff --git a/net/netdude/files/patch-nd_ip_callbacks.c b/net/netdude/files/patch-protocols-ip::nd_ip_callbacks.c
similarity index 100%
rename from net/netdude/files/patch-nd_ip_callbacks.c
rename to net/netdude/files/patch-protocols-ip::nd_ip_callbacks.c
diff --git a/net/netdude/files/patch-nd_snap.c b/net/netdude/files/patch-protocols-snap::nd_snap.c
similarity index 100%
rename from net/netdude/files/patch-nd_snap.c
rename to net/netdude/files/patch-protocols-snap::nd_snap.c
diff --git a/net/netdude/files/patch-nd_tcb.c b/net/netdude/files/patch-protocols-tcp::nd_tcb.c
similarity index 100%
rename from net/netdude/files/patch-nd_tcb.c
rename to net/netdude/files/patch-protocols-tcp::nd_tcb.c
diff --git a/net/netdude/files/patch-nd_udp.c b/net/netdude/files/patch-protocols-udp::nd_udp.c
similarity index 100%
rename from net/netdude/files/patch-nd_udp.c
rename to net/netdude/files/patch-protocols-udp::nd_udp.c
diff --git a/net/netdude/files/patch-nd.h b/net/netdude/files/patch-src::nd.h
similarity index 100%
rename from net/netdude/files/patch-nd.h
rename to net/netdude/files/patch-src::nd.h
diff --git a/net/netdude/files/patch-nd_misc.c b/net/netdude/files/patch-src::nd_misc.c
similarity index 100%
rename from net/netdude/files/patch-nd_misc.c
rename to net/netdude/files/patch-src::nd_misc.c
diff --git a/net/netdude/files/patch-nd_misc.h b/net/netdude/files/patch-src::nd_misc.h
similarity index 100%
rename from net/netdude/files/patch-nd_misc.h
rename to net/netdude/files/patch-src::nd_misc.h
diff --git a/net/netdude/files/patch-src::nd_protocol.c b/net/netdude/files/patch-src::nd_protocol.c
new file mode 100644
index 000000000000..1b07f7b17466
--- /dev/null
+++ b/net/netdude/files/patch-src::nd_protocol.c
@@ -0,0 +1,10 @@
+--- src/nd_protocol.c.orig	Wed Nov 20 20:13:36 2002
++++ src/nd_protocol.c	Wed Nov 20 20:14:20 2002
+@@ -26,6 +26,7 @@
+ #  include <config.h>
+ #endif
+ 
++#include <sys/types.h>
+ #include <netinet/in.h>
+ 
+ #include <netdude/nd.h>