--- nmap-6.25/libdnet-stripped/include/dnet/fw.h.orig	2012-12-06 13:46:17.245644790 -0800
+++ nmap-6.25/libdnet-stripped/include/dnet/fw.h	2012-12-06 13:48:24.783484617 -0800
@@ -39,16 +39,16 @@
 	(rule)->fw_dport[0] = dp1; (rule)->fw_dport[1] = dp2;		\
 } while (0)
 
-typedef struct fw_handle fw_t;
+typedef struct fw_handle dnet_fw_t;
 
 typedef int (*fw_handler)(const struct fw_rule *rule, void *arg);
 
 __BEGIN_DECLS
-fw_t	*fw_open(void);
-int	 fw_add(fw_t *f, const struct fw_rule *rule);
-int	 fw_delete(fw_t *f, const struct fw_rule *rule);
-int	 fw_loop(fw_t *f, fw_handler callback, void *arg);
-fw_t	*fw_close(fw_t *f);
+dnet_fw_t	*fw_open(void);
+int	 fw_add(dnet_fw_t *f, const struct fw_rule *rule);
+int	 fw_delete(dnet_fw_t *f, const struct fw_rule *rule);
+int	 fw_loop(dnet_fw_t *f, fw_handler callback, void *arg);
+dnet_fw_t	*fw_close(dnet_fw_t *f);
 __END_DECLS
 
 #endif /* DNET_FW_H */
--- nmap-6.25/libdnet-stripped/src/fw-none.c.orig	2012-12-06 13:58:57.466770363 -0800
+++ nmap-6.25/libdnet-stripped/src/fw-none.c	2012-12-06 13:48:40.567679655 -0800
@@ -14,7 +14,7 @@
 
 #include "dnet.h"
 
-fw_t *
+dnet_fw_t *
 fw_open(void)
 {
 	errno = ENOSYS;
@@ -22,28 +22,28 @@
 }
 
 int
-fw_add(fw_t *f, const struct fw_rule *rule)
+fw_add(dnet_fw_t *f, const struct fw_rule *rule)
 {
 	errno = ENOSYS;
 	return (-1);
 }
 
 int
-fw_delete(fw_t *f, const struct fw_rule *rule)
+fw_delete(dnet_fw_t *f, const struct fw_rule *rule)
 {
 	errno = ENOSYS;
 	return (-1);
 }
 
 int
-fw_loop(fw_t *f, fw_handler callback, void *arg)
+fw_loop(dnet_fw_t *f, fw_handler callback, void *arg)
 {
 	errno = ENOSYS;
 	return (-1);
 }
 
-fw_t *
-fw_close(fw_t *f)
+dnet_fw_t *
+fw_close(dnet_fw_t *f)
 {
 	return (NULL);
 }