Retire the MALLOC and FREE macros. They are an abomination unto style(9).

MFC after:	3 months

54 files changed, 233 insertions, 248 deletions

diff --git a/sys/netgraph/atm/sscfu/ng_sscfu_cust.h b/sys/netgraph/atm/sscfu/ng_sscfu_cust.h
index b700c1b..348575a 100644
--- a/sys/netgraph/atm/sscfu/ng_sscfu_cust.h
+++ b/sys/netgraph/atm/sscfu/ng_sscfu_cust.h
@@ -70,13 +70,13 @@
 #define	MEMZALLOC(PTR, CAST, SIZE)					\
 	((PTR) = (CAST)malloc((SIZE), M_NG_SSCFU_INS, M_NOWAIT | M_ZERO))
 #define	MEMFREE(PTR)							\
-	FREE(PTR, M_NG_SSCFU_INS)
+	free(PTR, M_NG_SSCFU_INS)
 
 #define	SIG_ALLOC(PTR)							\
 	((PTR) = malloc(sizeof(struct sscfu_sig),			\
 	    M_NG_SSCFU_SIG, M_NOWAIT | M_ZERO))
 #define	SIG_FREE(PTR)							\
-	FREE(PTR, M_NG_SSCFU_SIG)
+	free(PTR, M_NG_SSCFU_SIG)
 
 #endif
 
diff --git a/sys/netgraph/bluetooth/drivers/h4/ng_h4.c b/sys/netgraph/bluetooth/drivers/h4/ng_h4.c
index 853a31a..2bf1717 100644
--- a/sys/netgraph/bluetooth/drivers/h4/ng_h4.c
+++ b/sys/netgraph/bluetooth/drivers/h4/ng_h4.c
@@ -161,7 +161,7 @@ ng_h4_open(struct cdev *dev, struct tty *tp)
 		return (error);
 
 	/* Initialize private struct */
-	MALLOC(sc, ng_h4_info_p, sizeof(*sc), M_NETGRAPH_H4, M_NOWAIT|M_ZERO);
+	sc = malloc(sizeof(*sc), M_NETGRAPH_H4, M_NOWAIT|M_ZERO);
 	if (sc == NULL)
 		return (ENOMEM);
 
@@ -187,7 +187,7 @@ ng_h4_open(struct cdev *dev, struct tty *tp)
 
 		mtx_destroy(&sc->outq.ifq_mtx);
 		bzero(sc, sizeof(*sc));
-		FREE(sc, M_NETGRAPH_H4);
+		free(sc, M_NETGRAPH_H4);
 
 		return (error);
 	}
@@ -204,7 +204,7 @@ ng_h4_open(struct cdev *dev, struct tty *tp)
 		NG_NODE_UNREF(sc->node);
 		mtx_destroy(&sc->outq.ifq_mtx);
 		bzero(sc, sizeof(*sc));
-		FREE(sc, M_NETGRAPH_H4);
+		free(sc, M_NETGRAPH_H4);
 
 		return (error);
 	}
@@ -765,7 +765,7 @@ ng_h4_shutdown(node_p node)
 	NG_NODE_UNREF(node);
 	mtx_destroy(&sc->outq.ifq_mtx);
 	bzero(sc, sizeof(*sc));
-	FREE(sc, M_NETGRAPH_H4);
+	free(sc, M_NETGRAPH_H4);
 
 	return (0);
 } /* ng_h4_shutdown */
diff --git a/sys/netgraph/bluetooth/hci/ng_hci_main.c b/sys/netgraph/bluetooth/hci/ng_hci_main.c
index 7ea23c8..f6efbb4 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_main.c
+++ b/sys/netgraph/bluetooth/hci/ng_hci_main.c
@@ -109,7 +109,7 @@ ng_hci_constructor(node_p node)
 {
 	ng_hci_unit_p	unit = NULL;
 
-	MALLOC(unit, ng_hci_unit_p, sizeof(*unit), M_NETGRAPH_HCI,
+	unit = malloc(sizeof(*unit), M_NETGRAPH_HCI,
 		M_NOWAIT | M_ZERO);
 	if (unit == NULL)
 		return (ENOMEM);
@@ -170,7 +170,7 @@ ng_hci_shutdown(node_p node)
 	NG_BT_MBUFQ_DESTROY(&unit->cmdq);
 
 	bzero(unit, sizeof(*unit));
-	FREE(unit, M_NETGRAPH_HCI);
+	free(unit, M_NETGRAPH_HCI);
 
 	return (0);
 } /* ng_hci_shutdown */
diff --git a/sys/netgraph/bluetooth/hci/ng_hci_misc.c b/sys/netgraph/bluetooth/hci/ng_hci_misc.c
index d7a185c..252a580 100644
--- a/sys/netgraph/bluetooth/hci/ng_hci_misc.c
+++ b/sys/netgraph/bluetooth/hci/ng_hci_misc.c
@@ -176,7 +176,7 @@ ng_hci_new_neighbor(ng_hci_unit_p unit)
 {
 	ng_hci_neighbor_p	n = NULL;
 
-	MALLOC(n, ng_hci_neighbor_p, sizeof(*n), M_NETGRAPH_HCI,
+	n = malloc(sizeof(*n), M_NETGRAPH_HCI,
 		M_NOWAIT | M_ZERO); 
 	if (n != NULL) {
 		getmicrotime(&n->updated);
@@ -195,7 +195,7 @@ ng_hci_free_neighbor(ng_hci_neighbor_p n)
 {
 	LIST_REMOVE(n, next);
 	bzero(n, sizeof(*n));
-	FREE(n, M_NETGRAPH_HCI);
+	free(n, M_NETGRAPH_HCI);
 } /* ng_hci_free_neighbor */
 
 /*
@@ -258,7 +258,7 @@ ng_hci_new_con(ng_hci_unit_p unit, int link_type)
 	int			num_pkts;
 	static int		fake_con_handle = 0x0f00;
 
-	MALLOC(con, ng_hci_unit_con_p, sizeof(*con), M_NETGRAPH_HCI,
+	con = malloc(sizeof(*con), M_NETGRAPH_HCI,
 		M_NOWAIT | M_ZERO);
 	if (con != NULL) {
 		con->unit = unit;
@@ -321,7 +321,7 @@ ng_hci_free_con(ng_hci_unit_con_p con)
 	NG_BT_ITEMQ_DESTROY(&con->conq);
 
 	bzero(con, sizeof(*con));
-	FREE(con, M_NETGRAPH_HCI);
+	free(con, M_NETGRAPH_HCI);
 } /* ng_hci_free_con */
 
 /*
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c b/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c
index 7d5b300..23c6b01 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c
@@ -113,7 +113,7 @@ ng_l2cap_constructor(node_p node)
 	ng_l2cap_p	l2cap = NULL;
 
 	/* Create new L2CAP node */
-	MALLOC(l2cap, ng_l2cap_p, sizeof(*l2cap),
+	l2cap = malloc(sizeof(*l2cap),
 		M_NETGRAPH_L2CAP, M_NOWAIT|M_ZERO);
 	if (l2cap == NULL)
 		return (ENOMEM);
@@ -148,7 +148,7 @@ ng_l2cap_shutdown(node_p node)
 	ng_l2cap_cleanup(l2cap);
 
 	bzero(l2cap, sizeof(*l2cap));
-	FREE(l2cap, M_NETGRAPH_L2CAP);
+	free(l2cap, M_NETGRAPH_L2CAP);
 
 	return (0);
 } /* ng_l2cap_shutdown */
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c b/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c
index 635298a..3791dcd 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c
@@ -104,7 +104,7 @@ ng_l2cap_new_con(ng_l2cap_p l2cap, bdaddr_p bdaddr)
 	ng_l2cap_con_p	con = NULL;
 
 	/* Create new connection descriptor */
-	MALLOC(con, ng_l2cap_con_p, sizeof(*con), M_NETGRAPH_L2CAP,
+	con = malloc(sizeof(*con), M_NETGRAPH_L2CAP,
 		M_NOWAIT|M_ZERO);
 	if (con == NULL)
 		return (NULL);
@@ -284,7 +284,7 @@ ng_l2cap_free_con(ng_l2cap_con_p con)
 	LIST_REMOVE(con, next);
 
 	bzero(con, sizeof(*con));
-	FREE(con, M_NETGRAPH_L2CAP);
+	free(con, M_NETGRAPH_L2CAP);
 } /* ng_l2cap_free_con */
 
 /*
@@ -329,7 +329,7 @@ ng_l2cap_new_chan(ng_l2cap_p l2cap, ng_l2cap_con_p con, u_int16_t psm)
 {
 	ng_l2cap_chan_p	ch = NULL;
 
-	MALLOC(ch, ng_l2cap_chan_p, sizeof(*ch), M_NETGRAPH_L2CAP,
+	ch = malloc(sizeof(*ch), M_NETGRAPH_L2CAP,
 		M_NOWAIT|M_ZERO);
 	if (ch == NULL)
 		return (NULL);
@@ -357,7 +357,7 @@ ng_l2cap_new_chan(ng_l2cap_p l2cap, ng_l2cap_con_p con, u_int16_t psm)
 		ng_l2cap_con_ref(con);
 	} else {
 		bzero(ch, sizeof(*ch));
-		FREE(ch, M_NETGRAPH_L2CAP);
+		free(ch, M_NETGRAPH_L2CAP);
 		ch = NULL;
 	}
 
@@ -408,7 +408,7 @@ ng_l2cap_free_chan(ng_l2cap_chan_p ch)
 	ng_l2cap_con_unref(ch->con);
 
 	bzero(ch, sizeof(*ch));
-	FREE(ch, M_NETGRAPH_L2CAP);
+	free(ch, M_NETGRAPH_L2CAP);
 } /* ng_l2cap_free_chan */
 
 /*
@@ -425,7 +425,7 @@ ng_l2cap_new_cmd(ng_l2cap_con_p con, ng_l2cap_chan_p ch, u_int8_t ident,
 ("%s: %s - invalid channel pointer!\n",
 		__func__, NG_NODE_NAME(con->l2cap->node)));
 
-	MALLOC(cmd, ng_l2cap_cmd_p, sizeof(*cmd), M_NETGRAPH_L2CAP,
+	cmd = malloc(sizeof(*cmd), M_NETGRAPH_L2CAP,
 		M_NOWAIT|M_ZERO);
 	if (cmd == NULL)
 		return (NULL);
diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h b/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h
index ad97107..22cff48 100644
--- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h
+++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h
@@ -76,7 +76,7 @@ do { \
 	KASSERT(!callout_pending(&(cmd)->timo), ("Pending callout!")); \
 	NG_FREE_M((cmd)->aux); \
 	bzero((cmd), sizeof(*(cmd))); \
-	FREE((cmd), M_NETGRAPH_L2CAP); \
+	free((cmd), M_NETGRAPH_L2CAP); \
 } while (0)
 
 ng_l2cap_cmd_p ng_l2cap_new_cmd      (ng_l2cap_con_p, ng_l2cap_chan_p,
diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c b/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c
index 6b30022..8bde536 100644
--- a/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c
+++ b/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c
@@ -783,14 +783,10 @@ ng_btsocket_hci_raw_init(void)
 
 	/* 
 	 * Security filter
-	 * XXX never FREE()ed
+	 * XXX never free()ed
 	 */
-
-	ng_btsocket_hci_raw_sec_filter = NULL;
-
-	MALLOC(ng_btsocket_hci_raw_sec_filter, 
-		struct ng_btsocket_hci_raw_sec_filter *,
-		sizeof(struct ng_btsocket_hci_raw_sec_filter), 
+	ng_btsocket_hci_raw_sec_filter =
+	    malloc(sizeof(struct ng_btsocket_hci_raw_sec_filter), 
 		M_NETGRAPH_BTSOCKET_HCI_RAW, M_NOWAIT|M_ZERO);
 	if (ng_btsocket_hci_raw_sec_filter == NULL) {
 		printf("%s: Could not allocate security filter!\n", __func__);
@@ -914,7 +910,7 @@ ng_btsocket_hci_raw_attach(struct socket *so, int proto, struct thread *td)
 	if (error != 0)
 		return (error);
 
-	MALLOC(pcb, ng_btsocket_hci_raw_pcb_p, sizeof(*pcb), 
+	pcb = malloc(sizeof(*pcb), 
 		M_NETGRAPH_BTSOCKET_HCI_RAW, M_NOWAIT|M_ZERO);
 	if (pcb == NULL)
 		return (ENOMEM);
@@ -1493,7 +1489,7 @@ ng_btsocket_hci_raw_detach(struct socket *so)
 	mtx_destroy(&pcb->pcb_mtx);
 
 	bzero(pcb, sizeof(*pcb));
-	FREE(pcb, M_NETGRAPH_BTSOCKET_HCI_RAW);
+	free(pcb, M_NETGRAPH_BTSOCKET_HCI_RAW);
 
 	so->so_pcb = NULL;
 } /* ng_btsocket_hci_raw_detach */
diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c
index 11ef1df..b7b42fc 100644
--- a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c
+++ b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c
@@ -1563,7 +1563,7 @@ ng_btsocket_l2cap_default_msg_input(struct ng_mesg *msg, hook_p hook)
 
 		rt = (ng_btsocket_l2cap_rtentry_t *) NG_HOOK_PRIVATE(hook);
 		if (rt == NULL) {
-			MALLOC(rt, ng_btsocket_l2cap_rtentry_p, sizeof(*rt),
+			rt = malloc(sizeof(*rt),
 				M_NETGRAPH_BTSOCKET_L2CAP, M_NOWAIT|M_ZERO);
 			if (rt == NULL) {
 				mtx_unlock(&ng_btsocket_l2cap_rt_mtx);
@@ -1788,7 +1788,7 @@ ng_btsocket_l2cap_rtclean(void *context, int pending)
 			NG_HOOK_UNREF(rt->hook); /* Remove extra reference */
 
 			bzero(rt, sizeof(*rt));
-			FREE(rt, M_NETGRAPH_BTSOCKET_L2CAP);
+			free(rt, M_NETGRAPH_BTSOCKET_L2CAP);
 		}
 
 		rt = rt_next;
@@ -1930,7 +1930,7 @@ ng_btsocket_l2cap_attach(struct socket *so, int proto, struct thread *td)
 	}
 
 	/* Allocate the PCB */
-        MALLOC(pcb, ng_btsocket_l2cap_pcb_p, sizeof(*pcb),
+        pcb = malloc(sizeof(*pcb),
 		M_NETGRAPH_BTSOCKET_L2CAP, M_NOWAIT | M_ZERO);
         if (pcb == NULL)
                 return (ENOMEM);
@@ -2310,7 +2310,7 @@ ng_btsocket_l2cap_detach(struct socket *so)
 
 	mtx_destroy(&pcb->pcb_mtx);
 	bzero(pcb, sizeof(*pcb));
-	FREE(pcb, M_NETGRAPH_BTSOCKET_L2CAP);
+	free(pcb, M_NETGRAPH_BTSOCKET_L2CAP);
 
 	soisdisconnected(so);
 	so->so_pcb = NULL;
diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c
index f7190f7..2d2e006 100644
--- a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c
+++ b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c
@@ -377,8 +377,7 @@ ng_btsocket_l2cap_raw_input(void *context, int pending)
 			rt = (ng_btsocket_l2cap_rtentry_t *) 
 				NG_HOOK_PRIVATE(hook);
 			if (rt == NULL) {
-				MALLOC(rt, ng_btsocket_l2cap_rtentry_p, 
-					sizeof(*rt),
+				rt = malloc(					sizeof(*rt),
 					M_NETGRAPH_BTSOCKET_L2CAP_RAW,
 					M_NOWAIT|M_ZERO);
 				if (rt == NULL)
@@ -496,7 +495,7 @@ ng_btsocket_l2cap_raw_rtclean(void *context, int pending)
 			NG_HOOK_UNREF(rt->hook); /* Remove extra reference */
 
 			bzero(rt, sizeof(*rt));
-			FREE(rt, M_NETGRAPH_BTSOCKET_L2CAP_RAW);
+			free(rt, M_NETGRAPH_BTSOCKET_L2CAP_RAW);
 		}
 
 		rt = rt_next;
@@ -618,7 +617,7 @@ ng_btsocket_l2cap_raw_attach(struct socket *so, int proto, struct thread *td)
 		return (error);
 
 	/* Allocate the PCB */
-        MALLOC(pcb, ng_btsocket_l2cap_raw_pcb_p, sizeof(*pcb),
+        pcb = malloc(sizeof(*pcb),
 		M_NETGRAPH_BTSOCKET_L2CAP_RAW, M_NOWAIT|M_ZERO);
         if (pcb == NULL)
                 return (ENOMEM);
@@ -1129,7 +1128,7 @@ ng_btsocket_l2cap_raw_detach(struct socket *so)
 	mtx_destroy(&pcb->pcb_mtx);
 
 	bzero(pcb, sizeof(*pcb));
-	FREE(pcb, M_NETGRAPH_BTSOCKET_L2CAP_RAW);
+	free(pcb, M_NETGRAPH_BTSOCKET_L2CAP_RAW);
 
 	so->so_pcb = NULL;
 } /* ng_btsocket_l2cap_raw_detach */
diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c b/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c
index a3f344d..0fc1938 100644
--- a/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c
+++ b/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c
@@ -405,7 +405,7 @@ ng_btsocket_rfcomm_attach(struct socket *so, int proto, struct thread *td)
 	}
 
 	/* Allocate the PCB */
-        MALLOC(pcb, ng_btsocket_rfcomm_pcb_p, sizeof(*pcb),
+        pcb = malloc(sizeof(*pcb),
 		M_NETGRAPH_BTSOCKET_RFCOMM, M_NOWAIT | M_ZERO);
         if (pcb == NULL)
                 return (ENOMEM);
@@ -751,7 +751,7 @@ ng_btsocket_rfcomm_detach(struct socket *so)
 
 	mtx_destroy(&pcb->pcb_mtx);
 	bzero(pcb, sizeof(*pcb));
-	FREE(pcb, M_NETGRAPH_BTSOCKET_RFCOMM);
+	free(pcb, M_NETGRAPH_BTSOCKET_RFCOMM);
 
 	soisdisconnected(so);
 	so->so_pcb = NULL;
@@ -1069,7 +1069,7 @@ ng_btsocket_rfcomm_sessions_task(void *ctx, int pending)
 
 			mtx_destroy(&s->session_mtx);
 			bzero(s, sizeof(*s));
-			FREE(s, M_NETGRAPH_BTSOCKET_RFCOMM);
+			free(s, M_NETGRAPH_BTSOCKET_RFCOMM);
 		} else
 			mtx_unlock(&s->session_mtx);
 
@@ -1270,7 +1270,7 @@ ng_btsocket_rfcomm_session_create(ng_btsocket_rfcomm_session_p *sp,
 	mtx_assert(&ng_btsocket_rfcomm_sessions_mtx, MA_OWNED);
 
 	/* Allocate the RFCOMM session */
-        MALLOC(s, ng_btsocket_rfcomm_session_p, sizeof(*s),
+        s = malloc(sizeof(*s),
 		M_NETGRAPH_BTSOCKET_RFCOMM, M_NOWAIT | M_ZERO);
         if (s == NULL)
                 return (ENOMEM);
@@ -1390,7 +1390,7 @@ bad:
 
 	mtx_destroy(&s->session_mtx);
 	bzero(s, sizeof(*s));
-	FREE(s, M_NETGRAPH_BTSOCKET_RFCOMM);
+	free(s, M_NETGRAPH_BTSOCKET_RFCOMM);
 
 	return (error);
 } /* ng_btsocket_rfcomm_session_create */
diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c b/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c
index ea20759..9dae14a 100644
--- a/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c
+++ b/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c
@@ -828,7 +828,7 @@ ng_btsocket_sco_default_msg_input(struct ng_mesg *msg, hook_p hook)
 			break;
 
 		if (rt == NULL) {
-			MALLOC(rt, ng_btsocket_sco_rtentry_p, sizeof(*rt),
+			rt = malloc(sizeof(*rt),
 				M_NETGRAPH_BTSOCKET_SCO, M_NOWAIT|M_ZERO);
 			if (rt == NULL)
 				break;
@@ -1083,7 +1083,7 @@ ng_btsocket_sco_rtclean(void *context, int pending)
 			NG_HOOK_UNREF(rt->hook); /* Remove extra reference */
 
 			bzero(rt, sizeof(*rt));
-			FREE(rt, M_NETGRAPH_BTSOCKET_SCO);
+			free(rt, M_NETGRAPH_BTSOCKET_SCO);
 		}
 
 		rt = rt_next;
@@ -1221,7 +1221,7 @@ ng_btsocket_sco_attach(struct socket *so, int proto, struct thread *td)
 	}
 
 	/* Allocate the PCB */
-        MALLOC(pcb, ng_btsocket_sco_pcb_p, sizeof(*pcb),
+        pcb = malloc(sizeof(*pcb),
 		M_NETGRAPH_BTSOCKET_SCO, M_NOWAIT | M_ZERO);
         if (pcb == NULL)
                 return (ENOMEM);
@@ -1538,7 +1538,7 @@ ng_btsocket_sco_detach(struct socket *so)
 
 	mtx_destroy(&pcb->pcb_mtx);
 	bzero(pcb, sizeof(*pcb));
-	FREE(pcb, M_NETGRAPH_BTSOCKET_SCO);
+	free(pcb, M_NETGRAPH_BTSOCKET_SCO);
 
 	soisdisconnected(so);
 	so->so_pcb = NULL;
diff --git a/sys/netgraph/netflow/netflow.c b/sys/netgraph/netflow/netflow.c
index 29193ab..bf261a9 100644
--- a/sys/netgraph/netflow/netflow.c
+++ b/sys/netgraph/netflow/netflow.c
@@ -331,8 +331,7 @@ ng_netflow_cache_init(priv_p priv)
 	uma_zone_set_max(priv->zone, CACHESIZE);
 
 	/* Allocate hash. */
-	MALLOC(priv->hash, struct flow_hash_entry *,
-	    NBUCKETS * sizeof(struct flow_hash_entry),
+	priv->hash = malloc(	    NBUCKETS * sizeof(struct flow_hash_entry),
 	    M_NETFLOW_HASH, M_WAITOK | M_ZERO);
 
 	if (priv->hash == NULL) {
@@ -382,7 +381,7 @@ ng_netflow_cache_flush(priv_p priv)
 
 	/* Free hash memory. */
 	if (priv->hash)
-		FREE(priv->hash, M_NETFLOW_HASH);
+		free(priv->hash, M_NETFLOW_HASH);
 
 	mtx_destroy(&priv->export_mtx);
 }
diff --git a/sys/netgraph/netflow/ng_netflow.c b/sys/netgraph/netflow/ng_netflow.c
index 76fece8..d43c976 100644
--- a/sys/netgraph/netflow/ng_netflow.c
+++ b/sys/netgraph/netflow/ng_netflow.c
@@ -185,7 +185,7 @@ ng_netflow_constructor(node_p node)
 	int error = 0, i;
 
 	/* Initialize private data */
-	MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_NOWAIT);
+	priv = malloc(sizeof(*priv), M_NETGRAPH, M_NOWAIT);
 	if (priv == NULL)
 		return (ENOMEM);
 	bzero(priv, sizeof(*priv));
@@ -708,7 +708,7 @@ ng_netflow_rmnode(node_p node)
 	NG_NODE_SET_PRIVATE(node, NULL);
 	NG_NODE_UNREF(priv->node);
 
-	FREE(priv, M_NETGRAPH);
+	free(priv, M_NETGRAPH);
 
 	return (0);
 }
diff --git a/sys/netgraph/netgraph.h b/sys/netgraph/netgraph.h
index 1fc0b19..78af963 100644
--- a/sys/netgraph/netgraph.h
+++ b/sys/netgraph/netgraph.h
@@ -915,7 +915,7 @@ _ngi_hook(item_p item, char *file, int line)
 #define NG_FREE_MSG(msg)						\
 	do {								\
 		if ((msg)) {						\
-			FREE((msg), M_NETGRAPH_MSG);			\
+			free((msg), M_NETGRAPH_MSG);			\
 			(msg) = NULL;					\
 		}	 						\
 	} while (0)
diff --git a/sys/netgraph/ng_UI.c b/sys/netgraph/ng_UI.c
index 4755eb3..a896877 100644
--- a/sys/netgraph/ng_UI.c
+++ b/sys/netgraph/ng_UI.c
@@ -103,7 +103,7 @@ ng_UI_constructor(node_p node)
 	priv_p  priv;
 
 	/* Allocate private structure */
-	MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_NOWAIT | M_ZERO);
+	priv = malloc(sizeof(*priv), M_NETGRAPH, M_NOWAIT | M_ZERO);
 	if (priv == NULL) {
 		return (ENOMEM);
 	}
@@ -215,7 +215,7 @@ ng_UI_shutdown(node_p node)
 	const priv_p priv = NG_NODE_PRIVATE(node);
 
 	/* Take down netgraph node */
-	FREE(priv, M_NETGRAPH);
+	free(priv, M_NETGRAPH);
 	NG_NODE_SET_PRIVATE(node, NULL);
 	NG_NODE_UNREF(node);
 	return (0);
diff --git a/sys/netgraph/ng_async.c b/sys/netgraph/ng_async.c
index 6cb5345..6841617 100644
--- a/sys/netgraph/ng_async.c
+++ b/sys/netgraph/ng_async.c
@@ -183,23 +183,21 @@ nga_constructor(node_p node)
 {
 	sc_p sc;
 
-	MALLOC(sc, sc_p, sizeof(*sc), M_NETGRAPH_ASYNC, M_NOWAIT | M_ZERO);
+	sc = malloc(sizeof(*sc), M_NETGRAPH_ASYNC, M_NOWAIT | M_ZERO);
 	if (sc == NULL)
 		return (ENOMEM);
 	sc->amode = MODE_HUNT;
 	sc->cfg.accm = ~0;
 	sc->cfg.amru = NG_ASYNC_DEFAULT_MRU;
 	sc->cfg.smru = NG_ASYNC_DEFAULT_MRU;
-	MALLOC(sc->abuf, u_char *,
-	    ASYNC_BUF_SIZE(sc->cfg.smru), M_NETGRAPH_ASYNC, M_NOWAIT);
+	sc->abuf = malloc(	    ASYNC_BUF_SIZE(sc->cfg.smru), M_NETGRAPH_ASYNC, M_NOWAIT);
 	if (sc->abuf == NULL)
 		goto fail;
-	MALLOC(sc->sbuf, u_char *,
-	    SYNC_BUF_SIZE(sc->cfg.amru), M_NETGRAPH_ASYNC, M_NOWAIT);
+	sc->sbuf = malloc(	    SYNC_BUF_SIZE(sc->cfg.amru), M_NETGRAPH_ASYNC, M_NOWAIT);
 	if (sc->sbuf == NULL) {
-		FREE(sc->abuf, M_NETGRAPH_ASYNC);
+		free(sc->abuf, M_NETGRAPH_ASYNC);
 fail:
-		FREE(sc, M_NETGRAPH_ASYNC);
+		free(sc, M_NETGRAPH_ASYNC);
 		return (ENOMEM);
 	}
 	NG_NODE_SET_PRIVATE(node, sc);
@@ -298,19 +296,19 @@ nga_rcvmsg(node_p node, item_p item, hook_p lasthook)
 				ERROUT(EINVAL);
 			cfg->enabled = !!cfg->enabled;	/* normalize */
 			if (cfg->smru > sc->cfg.smru) {	/* reallocate buffer */
-				MALLOC(buf, u_char *, ASYNC_BUF_SIZE(cfg->smru),
+				buf = malloc(ASYNC_BUF_SIZE(cfg->smru),
 				    M_NETGRAPH_ASYNC, M_NOWAIT);
 				if (!buf)
 					ERROUT(ENOMEM);
-				FREE(sc->abuf, M_NETGRAPH_ASYNC);
+				free(sc->abuf, M_NETGRAPH_ASYNC);
 				sc->abuf = buf;
 			}
 			if (cfg->amru > sc->cfg.amru) {	/* reallocate buffer */
-				MALLOC(buf, u_char *, SYNC_BUF_SIZE(cfg->amru),
+				buf = malloc(SYNC_BUF_SIZE(cfg->amru),
 				    M_NETGRAPH_ASYNC, M_NOWAIT);
 				if (!buf)
 					ERROUT(ENOMEM);
-				FREE(sc->sbuf, M_NETGRAPH_ASYNC);
+				free(sc->sbuf, M_NETGRAPH_ASYNC);
 				sc->sbuf = buf;
 				sc->amode = MODE_HUNT;
 				sc->slen = 0;
@@ -349,10 +347,10 @@ nga_shutdown(node_p node)
 {
 	const sc_p sc = NG_NODE_PRIVATE(node);
 
-	FREE(sc->abuf, M_NETGRAPH_ASYNC);
-	FREE(sc->sbuf, M_NETGRAPH_ASYNC);
+	free(sc->abuf, M_NETGRAPH_ASYNC);
+	free(sc->sbuf, M_NETGRAPH_ASYNC);
 	bzero(sc, sizeof(*sc));
-	FREE(sc, M_NETGRAPH_ASYNC);
+	free(sc, M_NETGRAPH_ASYNC);
 	NG_NODE_SET_PRIVATE(node, NULL);
 	NG_NODE_UNREF(node);
 	return (0);
diff --git a/sys/netgraph/ng_atmllc.c b/sys/netgraph/ng_atmllc.c
index 64bf8c3..6498056 100644
--- a/sys/netgraph/ng_atmllc.c
+++ b/sys/netgraph/ng_atmllc.c
@@ -80,7 +80,7 @@ ng_atmllc_constructor(node_p node)
 {
 	struct	ng_atmllc_priv *priv;
 
-	MALLOC(priv, struct ng_atmllc_priv *, sizeof(*priv), M_NETGRAPH,
+	priv = malloc(sizeof(*priv), M_NETGRAPH,
 	    M_NOWAIT | M_ZERO);
 	if (priv == NULL) {
 		return (ENOMEM);
@@ -111,7 +111,7 @@ ng_atmllc_shutdown(node_p node)
 
 	priv = NG_NODE_PRIVATE(node);
 
-	FREE(priv, M_NETGRAPH);
+	free(priv, M_NETGRAPH);
 
 	NG_NODE_UNREF(node);
 
diff --git a/sys/netgraph/ng_base.c b/sys/netgraph/ng_base.c
index 2a84d429..6a0ce88 100644
--- a/sys/netgraph/ng_base.c
+++ b/sys/netgraph/ng_base.c
@@ -234,9 +234,9 @@ MALLOC_DEFINE(M_NETGRAPH_MSG, "netgraph_msg", "netgraph name storage");
 /* Should not be visible outside this file */
 
 #define _NG_ALLOC_HOOK(hook) \
-	MALLOC(hook, hook_p, sizeof(*hook), M_NETGRAPH_HOOK, M_NOWAIT | M_ZERO)
+	hook = malloc(sizeof(*hook), M_NETGRAPH_HOOK, M_NOWAIT | M_ZERO)
 #define _NG_ALLOC_NODE(node) \
-	MALLOC(node, node_p, sizeof(*node), M_NETGRAPH_NODE, M_NOWAIT | M_ZERO)
+	node = malloc(sizeof(*node), M_NETGRAPH_NODE, M_NOWAIT | M_ZERO)
 
 #define	NG_QUEUE_LOCK_INIT(n)			\
 	mtx_init(&(n)->q_mtx, "ng_node", NULL, MTX_DEF)
@@ -339,8 +339,8 @@ ng_alloc_node(void)
 #define NG_ALLOC_HOOK(hook) _NG_ALLOC_HOOK(hook)
 #define NG_ALLOC_NODE(node) _NG_ALLOC_NODE(node)
 
-#define NG_FREE_HOOK(hook) do { FREE((hook), M_NETGRAPH_HOOK); } while (0)
-#define NG_FREE_NODE(node) do { FREE((node), M_NETGRAPH_NODE); } while (0)
+#define NG_FREE_HOOK(hook) do { free((hook), M_NETGRAPH_HOOK); } while (0)
+#define NG_FREE_NODE(node) do { free((node), M_NETGRAPH_NODE); } while (0)
 
 #endif /* NETGRAPH_DEBUG */ /*----------------------------------------------*/
 
diff --git a/sys/netgraph/ng_bpf.c b/sys/netgraph/ng_bpf.c
index 7d7aa26..50a6bf7 100644
--- a/sys/netgraph/ng_bpf.c
+++ b/sys/netgraph/ng_bpf.c
@@ -277,7 +277,7 @@ ng_bpf_newhook(node_p node, hook_p hook, const char *name)
 	int error;
 
 	/* Create hook private structure */
-	MALLOC(hip, hinfo_p, sizeof(*hip), M_NETGRAPH_BPF, M_NOWAIT | M_ZERO);
+	hip = malloc(sizeof(*hip), M_NETGRAPH_BPF, M_NOWAIT | M_ZERO);
 	if (hip == NULL)
 		return (ENOMEM);
 	hip->hook = hook;
@@ -288,7 +288,7 @@ ng_bpf_newhook(node_p node, hook_p hook, const char *name)
 
 	/* Attach the default BPF program */
 	if ((error = ng_bpf_setprog(hook, &ng_bpf_default_prog)) != 0) {
-		FREE(hip, M_NETGRAPH_BPF);
+		free(hip, M_NETGRAPH_BPF);
 		NG_HOOK_SET_PRIVATE(hook, NULL);
 		return (error);
 	}
@@ -445,7 +445,7 @@ ng_bpf_rcvdata(hook_p hook, item_p item)
 	/* Need to put packet in contiguous memory for bpf */
 	if (m->m_next != NULL && totlen > MHLEN) {
 		if (usejit) {
-			MALLOC(data, u_char *, totlen, M_NETGRAPH_BPF, M_NOWAIT);
+			data = malloc(totlen, M_NETGRAPH_BPF, M_NOWAIT);
 			if (data == NULL) {
 				NG_FREE_ITEM(item);
 				return (ENOMEM);
@@ -475,7 +475,7 @@ ng_bpf_rcvdata(hook_p hook, item_p item)
 	else
 		len = bpf_filter(hip->prog->bpf_prog, (u_char *)m, totlen, 0);
 	if (needfree)
-		FREE(data, M_NETGRAPH_BPF);
+		free(data, M_NETGRAPH_BPF);
 ready:
 	/* See if we got a match and find destination hook */
 	if (len > 0) {
@@ -532,12 +532,12 @@ ng_bpf_disconnect(hook_p hook)
 	/* Remove our reference from other hooks data. */
 	NG_NODE_FOREACH_HOOK(node, ng_bpf_remrefs, hook, tmp);
 
-	FREE(hip->prog, M_NETGRAPH_BPF);
+	free(hip->prog, M_NETGRAPH_BPF);
 #ifdef BPF_JITTER
 	if (hip->jit_prog != NULL)
 		bpf_destroy_jit_filter(hip->jit_prog);
 #endif
-	FREE(hip, M_NETGRAPH_BPF);
+	free(hip, M_NETGRAPH_BPF);
 	if ((NG_NODE_NUMHOOKS(node) == 0) &&
 	    (NG_NODE_IS_VALID(node))) {
 		ng_rmnode_self(node);
@@ -569,7 +569,7 @@ ng_bpf_setprog(hook_p hook, const struct ng_bpf_hookprog *hp0)
 
 	/* Make a copy of the program */
 	size = NG_BPF_HOOKPROG_SIZE(hp0->bpf_prog_len);
-	MALLOC(hp, struct ng_bpf_hookprog *, size, M_NETGRAPH_BPF, M_NOWAIT);
+	hp = malloc(size, M_NETGRAPH_BPF, M_NOWAIT);
 	if (hp == NULL)
 		return (ENOMEM);
 	bcopy(hp0, hp, size);
@@ -579,7 +579,7 @@ ng_bpf_setprog(hook_p hook, const struct ng_bpf_hookprog *hp0)
 
 	/* Free previous program, if any, and assign new one */
 	if (hip->prog != NULL)
-		FREE(hip->prog, M_NETGRAPH_BPF);
+		free(hip->prog, M_NETGRAPH_BPF);
 	hip->prog = hp;
 #ifdef BPF_JITTER
 	if (hip->jit_prog != NULL)
diff --git a/sys/netgraph/ng_bridge.c b/sys/netgraph/ng_bridge.c
index 5f9c835..da48f23 100644
--- a/sys/netgraph/ng_bridge.c
+++ b/sys/netgraph/ng_bridge.c
@@ -298,16 +298,15 @@ ng_bridge_constructor(node_p node)
 	priv_p priv;
 
 	/* Allocate and initialize private info */
-	MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH_BRIDGE, M_NOWAIT | M_ZERO);
+	priv = malloc(sizeof(*priv), M_NETGRAPH_BRIDGE, M_NOWAIT | M_ZERO);
 	if (priv == NULL)
 		return (ENOMEM);
 	ng_callout_init(&priv->timer);
 
 	/* Allocate and initialize hash table, etc. */
-	MALLOC(priv->tab, struct ng_bridge_bucket *,
-	    MIN_BUCKETS * sizeof(*priv->tab), M_NETGRAPH_BRIDGE, M_NOWAIT | M_ZERO);
+	priv->tab = malloc(	    MIN_BUCKETS * sizeof(*priv->tab), M_NETGRAPH_BRIDGE, M_NOWAIT | M_ZERO);
 	if (priv->tab == NULL) {
-		FREE(priv, M_NETGRAPH_BRIDGE);
+		free(priv, M_NETGRAPH_BRIDGE);
 		return (ENOMEM);
 	}
 	priv->numBuckets = MIN_BUCKETS;
@@ -359,8 +358,7 @@ ng_bridge_newhook(node_p node, hook_p hook, const char *name)
 			return (EINVAL);
 		if (priv->links[linkNum] != NULL)
 			return (EISCONN);
-		MALLOC(priv->links[linkNum], struct ng_bridge_link *,
-		    sizeof(*priv->links[linkNum]), M_NETGRAPH_BRIDGE, M_NOWAIT|M_ZERO);
+		priv->links[linkNum] = malloc(		    sizeof(*priv->links[linkNum]), M_NETGRAPH_BRIDGE, M_NOWAIT|M_ZERO);
 		if (priv->links[linkNum] == NULL)
 			return (ENOMEM);
 		priv->links[linkNum]->hook = hook;
@@ -767,8 +765,8 @@ ng_bridge_shutdown(node_p node)
 	ng_uncallout(&priv->timer, node);
 	NG_NODE_SET_PRIVATE(node, NULL);
 	NG_NODE_UNREF(node);
-	FREE(priv->tab, M_NETGRAPH_BRIDGE);
-	FREE(priv, M_NETGRAPH_BRIDGE);
+	free(priv->tab, M_NETGRAPH_BRIDGE);
+	free(priv, M_NETGRAPH_BRIDGE);
 	return (0);
 }
 
@@ -791,7 +789,7 @@ ng_bridge_disconnect(hook_p hook)
 
 	/* Free associated link information */
 	KASSERT(priv->links[linkNum] != NULL, ("%s: no link", __func__));
-	FREE(priv->links[linkNum], M_NETGRAPH_BRIDGE);
+	free(priv->links[linkNum], M_NETGRAPH_BRIDGE);
 	priv->links[linkNum] = NULL;
 	priv->numLinks--;
 
@@ -850,8 +848,7 @@ ng_bridge_put(priv_p priv, const u_char *addr, int linkNum)
 #endif
 
 	/* Allocate and initialize new hashtable entry */
-	MALLOC(hent, struct ng_bridge_hent *,
-	    sizeof(*hent), M_NETGRAPH_BRIDGE, M_NOWAIT);
+	hent = malloc(	    sizeof(*hent), M_NETGRAPH_BRIDGE, M_NOWAIT);
 	if (hent == NULL)
 		return (0);
 	bcopy(addr, hent->host.addr, ETHER_ADDR_LEN);
@@ -895,8 +892,7 @@ ng_bridge_rehash(priv_p priv)
 	newMask = newNumBuckets - 1;
 
 	/* Allocate and initialize new table */
-	MALLOC(newTab, struct ng_bridge_bucket *,
-	    newNumBuckets * sizeof(*newTab), M_NETGRAPH_BRIDGE, M_NOWAIT | M_ZERO);
+	newTab = malloc(	    newNumBuckets * sizeof(*newTab), M_NETGRAPH_BRIDGE, M_NOWAIT | M_ZERO);
 	if (newTab == NULL)
 		return;
 
@@ -920,7 +916,7 @@ ng_bridge_rehash(priv_p priv)
 		    ng_bridge_nodename(priv->node),
 		    priv->numBuckets, newNumBuckets);
 	}
-	FREE(priv->tab, M_NETGRAPH_BRIDGE);
+	free(priv->tab, M_NETGRAPH_BRIDGE);
 	priv->numBuckets = newNumBuckets;
 	priv->hashMask = newMask;
 	priv->tab = newTab;
@@ -948,7 +944,7 @@ ng_bridge_remove_hosts(priv_p priv, int linkNum)
 
 			if (linkNum == -1 || hent->host.linkNum == linkNum) {
 				*hptr = SLIST_NEXT(hent, next);
-				FREE(hent, M_NETGRAPH_BRIDGE);
+				free(hent, M_NETGRAPH_BRIDGE);
 				priv->numHosts--;
 			} else
 				hptr = &SLIST_NEXT(hent, next);
@@ -986,7 +982,7 @@ ng_bridge_timeout(node_p node, hook_p hook, void *arg1, int arg2)
 			/* Remove hosts we haven't heard from in a while */
 			if (++hent->host.staleness >= priv->conf.maxStaleness) {
 				*hptr = SLIST_NEXT(hent, next);
-				FREE(hent, M_NETGRAPH_BRIDGE);
+				free(hent, M_NETGRAPH_BRIDGE);
 				priv->numHosts--;
 			} else {
 				if (hent->host.age < 0xffff)
diff --git a/sys/netgraph/ng_cisco.c b/sys/netgraph/ng_cisco.c
index 187523a..785b055 100644
--- a/sys/netgraph/ng_cisco.c
+++ b/sys/netgraph/ng_cisco.c
@@ -193,7 +193,7 @@ cisco_constructor(node_p node)
 {
 	sc_p sc;
 
-	MALLOC(sc, sc_p, sizeof(*sc), M_NETGRAPH, M_NOWAIT | M_ZERO);
+	sc = malloc(sizeof(*sc), M_NETGRAPH, M_NOWAIT | M_ZERO);
 	if (sc == NULL)
 		return (ENOMEM);
 
@@ -408,7 +408,7 @@ cisco_shutdown(node_p node)
 
 	NG_NODE_SET_PRIVATE(node, NULL);
 	NG_NODE_UNREF(sc->node);
-	FREE(sc, M_NETGRAPH);
+	free(sc, M_NETGRAPH);
 	return (0);
 }
 
diff --git a/sys/netgraph/ng_device.c b/sys/netgraph/ng_device.c
index 5db9218..eb094be 100644
--- a/sys/netgraph/ng_device.c
+++ b/sys/netgraph/ng_device.c
@@ -163,7 +163,7 @@ ng_device_constructor(node_p node)
 
 	DBG;
 
-	MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_NOWAIT | M_ZERO);
+	priv = malloc(sizeof(*priv), M_NETGRAPH, M_NOWAIT | M_ZERO);
 	if (priv == NULL)
 		return (ENOMEM);
 
@@ -186,7 +186,7 @@ ng_device_constructor(node_p node)
 		mtx_destroy(&priv->ngd_mtx);
 		mtx_destroy(&priv->readq.ifq_mtx);
 		free_unr(ngd_unit, priv->unit);
-		FREE(priv, M_NETGRAPH);
+		free(priv, M_NETGRAPH);
 		return(EINVAL);
 	}
 	/* XXX: race here? */
@@ -307,7 +307,7 @@ ng_device_disconnect(hook_p hook)
 
 	free_unr(ngd_unit, priv->unit);
 
-	FREE(priv, M_NETGRAPH);
+	free(priv, M_NETGRAPH);
 
 	ng_rmnode_self(NG_HOOK_NODE(hook));
 
diff --git a/sys/netgraph/ng_eiface.c b/sys/netgraph/ng_eiface.c
index dc52f95..09011d2 100644
--- a/sys/netgraph/ng_eiface.c
+++ b/sys/netgraph/ng_eiface.c
@@ -339,7 +339,7 @@ ng_eiface_constructor(node_p node)
 	u_char eaddr[6] = {0,0,0,0,0,0};
 
 	/* Allocate node and interface private structures */
-	MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_NOWAIT | M_ZERO);
+	priv = malloc(sizeof(*priv), M_NETGRAPH, M_NOWAIT | M_ZERO);
 	if (priv == NULL)
 		return (ENOMEM);
 
@@ -559,7 +559,7 @@ ng_eiface_rmnode(node_p node)
 	if_free(ifp);
 	CURVNET_RESTORE();
 	free_unr(V_ng_eiface_unit, priv->unit);
-	FREE(priv, M_NETGRAPH);
+	free(priv, M_NETGRAPH);
 	NG_NODE_SET_PRIVATE(node, NULL);
 	NG_NODE_UNREF(node);
 	return (0);
diff --git a/sys/netgraph/ng_etf.c b/sys/netgraph/ng_etf.c
index 11a0d96..7e607f7 100644
--- a/sys/netgraph/ng_etf.c
+++ b/sys/netgraph/ng_etf.c
@@ -180,7 +180,7 @@ ng_etf_constructor(node_p node)
 	int i;
 
 	/* Initialize private descriptor */
-	MALLOC(privdata, etf_p, sizeof(*privdata), M_NETGRAPH_ETF,
+	privdata = malloc(sizeof(*privdata), M_NETGRAPH_ETF,
 		M_NOWAIT | M_ZERO);
 	if (privdata == NULL)
 		return (ENOMEM);
@@ -217,7 +217,7 @@ ng_etf_newhook(node_p node, hook_p hook, const char *name)
 		 * Any other hook name is valid and can
 		 * later be associated with a filter rule.
 		 */
-		MALLOC(hpriv, struct ETF_hookinfo *, sizeof(*hpriv),
+		hpriv = malloc(sizeof(*hpriv),
 			M_NETGRAPH_ETF, M_NOWAIT | M_ZERO);
 		if (hpriv == NULL) {
 			return (ENOMEM);
@@ -317,7 +317,7 @@ ng_etf_rcvmsg(node_p node, item_p item, hook_p lasthook)
 				 * Ok, make the filter and put it in the 
 				 * hashtable ready for matching.
 				 */
-				MALLOC(fil, struct filter *, sizeof(*fil),
+				fil = malloc(sizeof(*fil),
 					M_NETGRAPH_ETF, M_NOWAIT | M_ZERO);
 				if (fil == NULL) {
 					error = ENOMEM;
@@ -440,7 +440,7 @@ ng_etf_shutdown(node_p node)
 
 	NG_NODE_SET_PRIVATE(node, NULL);
 	NG_NODE_UNREF(privdata->node);
-	FREE(privdata, M_NETGRAPH_ETF);
+	free(privdata, M_NETGRAPH_ETF);
 	return (0);
 }
 
@@ -463,7 +463,7 @@ ng_etf_disconnect(hook_p hook)
 			fil2 = LIST_NEXT(fil1, next);
 			if (fil1->match_hook == hook) {
 				LIST_REMOVE(fil1, next);
-				FREE(fil1, M_NETGRAPH_ETF);
+				free(fil1, M_NETGRAPH_ETF);
 			}
 			fil1 = fil2;
 		}
@@ -476,7 +476,7 @@ ng_etf_disconnect(hook_p hook)
 		etfp->nomatch_hook.hook = NULL;
 	} else {
 		if (NG_HOOK_PRIVATE(hook)) /* Paranoia */
-			FREE(NG_HOOK_PRIVATE(hook), M_NETGRAPH_ETF);
+			free(NG_HOOK_PRIVATE(hook), M_NETGRAPH_ETF);
 	}
 
 	NG_HOOK_SET_PRIVATE(hook, NULL);
diff --git a/sys/netgraph/ng_ether.c b/sys/netgraph/ng_ether.c
index 115f3cf..9bcd374 100644
--- a/sys/netgraph/ng_ether.c
+++ b/sys/netgraph/ng_ether.c
@@ -292,7 +292,7 @@ ng_ether_attach(struct ifnet *ifp)
 	}
 
 	/* Allocate private data */
-	MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_NOWAIT | M_ZERO);
+	priv = malloc(sizeof(*priv), M_NETGRAPH, M_NOWAIT | M_ZERO);
 	if (priv == NULL) {
 		log(LOG_ERR, "%s: can't %s for %s\n",
 		    __func__, "allocate memory", ifp->if_xname);
@@ -683,7 +683,7 @@ ng_ether_shutdown(node_p node)
 		 * Assume the ifp has already been freed.
 		 */
 		NG_NODE_SET_PRIVATE(node, NULL);
-		FREE(priv, M_NETGRAPH);		
+		free(priv, M_NETGRAPH);		
 		NG_NODE_UNREF(node);	/* free node itself */
 		return (0);
 	}
diff --git a/sys/netgraph/ng_fec.c b/sys/netgraph/ng_fec.c
index 58f16a9..83a3462 100644
--- a/sys/netgraph/ng_fec.c
+++ b/sys/netgraph/ng_fec.c
@@ -284,7 +284,7 @@ ng_fec_get_unit(int *unit)
 		int i, *newarray, newlen;
 
 		newlen = (2 * ng_fec_units_len) + 4;
-		MALLOC(newarray, int *, newlen * sizeof(*ng_fec_units),
+		newarray = malloc(newlen * sizeof(*ng_fec_units),
 		    M_NETGRAPH, M_NOWAIT);
 		if (newarray == NULL) {
 			mtx_unlock(&ng_fec_mtx);
@@ -295,7 +295,7 @@ ng_fec_get_unit(int *unit)
 		for (i = ng_fec_units_len; i < newlen; i++)
 			newarray[i] = ~0;
 		if (ng_fec_units != NULL)
-			FREE(ng_fec_units, M_NETGRAPH);
+			free(ng_fec_units, M_NETGRAPH);
 		ng_fec_units = newarray;
 		ng_fec_units_len = newlen;
 	}
@@ -333,7 +333,7 @@ ng_fec_free_unit(int unit)
 	 */
 	ng_units_in_use--;
 	if (ng_units_in_use == 0) { /* XXX make SMP safe */
-		FREE(ng_fec_units, M_NETGRAPH);
+		free(ng_fec_units, M_NETGRAPH);
 		ng_fec_units_len = 0;
 		ng_fec_units = NULL;
 	}
@@ -403,8 +403,7 @@ ng_fec_addport(struct ng_fec_private *priv, char *iface)
 	}
 
 	/* Allocate new list entry. */
-	MALLOC(new, struct ng_fec_portlist *,
-	    sizeof(struct ng_fec_portlist), M_NETGRAPH, M_NOWAIT);
+	new = malloc(	    sizeof(struct ng_fec_portlist), M_NETGRAPH, M_NOWAIT);
 	if (new == NULL)
 		return(ENOMEM);
 
@@ -511,7 +510,7 @@ ng_fec_delport(struct ng_fec_private *priv, char *iface)
 
 	/* Delete port */
 	TAILQ_REMOVE(&b->ng_fec_ports, p, fec_list);
-	FREE(p, M_NETGRAPH);
+	free(p, M_NETGRAPH);
 	b->fec_ifcnt--;
 
 	if (b->fec_ifcnt == 0)
@@ -1196,13 +1195,13 @@ ng_fec_constructor(node_p node)
 	int error = 0;
 
 	/* Allocate node and interface private structures */
-	MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_NOWAIT | M_ZERO);
+	priv = malloc(sizeof(*priv), M_NETGRAPH, M_NOWAIT | M_ZERO);
 	if (priv == NULL)
 		return (ENOMEM);
 
 	ifp = priv->ifp = if_alloc(IFT_ETHER);
 	if (ifp == NULL) {
-		FREE(priv, M_NETGRAPH);
+		free(priv, M_NETGRAPH);
 		return (ENOSPC);
 	}
 	b = &priv->fec_bundle;
@@ -1213,7 +1212,7 @@ ng_fec_constructor(node_p node)
 	/* Get an interface unit number */
 	if ((error = ng_fec_get_unit(&priv->unit)) != 0) {
 		if_free(ifp);
-		FREE(priv, M_NETGRAPH);
+		free(priv, M_NETGRAPH);
 		return (error);
 	}
 
@@ -1337,7 +1336,7 @@ ng_fec_shutdown(node_p node)
 	if_free_type(priv->ifp, IFT_ETHER);
 	ifmedia_removeall(&priv->ifmedia);
 	ng_fec_free_unit(priv->unit);
-	FREE(priv, M_NETGRAPH);
+	free(priv, M_NETGRAPH);
 	NG_NODE_SET_PRIVATE(node, NULL);
 	NG_NODE_UNREF(node);
 	return (0);
diff --git a/sys/netgraph/ng_frame_relay.c b/sys/netgraph/ng_frame_relay.c
index 406de69..599e80e 100644
--- a/sys/netgraph/ng_frame_relay.c
+++ b/sys/netgraph/ng_frame_relay.c
@@ -212,7 +212,7 @@ ngfrm_constructor(node_p node)
 {
 	sc_p sc;
 
-	MALLOC(sc, sc_p, sizeof(*sc), M_NETGRAPH, M_NOWAIT | M_ZERO);
+	sc = malloc(sizeof(*sc), M_NETGRAPH, M_NOWAIT | M_ZERO);
 	if (!sc)
 		return (ENOMEM);
 	sc->addrlen = 2;	/* default */
@@ -481,7 +481,7 @@ ngfrm_shutdown(node_p node)
 	const sc_p sc = NG_NODE_PRIVATE(node);
 
 	NG_NODE_SET_PRIVATE(node, NULL);
-	FREE(sc, M_NETGRAPH);
+	free(sc, M_NETGRAPH);
 	NG_NODE_UNREF(node);
 	return (0);
 }
diff --git a/sys/netgraph/ng_gif.c b/sys/netgraph/ng_gif.c
index 96113d2..22d085a 100644
--- a/sys/netgraph/ng_gif.c
+++ b/sys/netgraph/ng_gif.c
@@ -241,7 +241,7 @@ ng_gif_attach(struct ifnet *ifp)
 	}
 
 	/* Allocate private data */
-	MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_NOWAIT | M_ZERO);
+	priv = malloc(sizeof(*priv), M_NETGRAPH, M_NOWAIT | M_ZERO);
 	if (priv == NULL) {
 		log(LOG_ERR, "%s: can't %s for %s\n",
 		    __func__, "allocate memory", ifp->if_xname);
@@ -503,7 +503,7 @@ ng_gif_shutdown(node_p node)
 		 * Assume the ifp has already been freed.
 		 */
 		NG_NODE_SET_PRIVATE(node, NULL);
-		FREE(priv, M_NETGRAPH);		
+		free(priv, M_NETGRAPH);		
 		NG_NODE_UNREF(node);	/* free node itself */
 		return (0);
 	}
diff --git a/sys/netgraph/ng_gif_demux.c b/sys/netgraph/ng_gif_demux.c
index 1c5c43a..a5ac5e1 100644
--- a/sys/netgraph/ng_gif_demux.c
+++ b/sys/netgraph/ng_gif_demux.c
@@ -233,7 +233,7 @@ ng_gif_demux_constructor(node_p node)
 	priv_p priv;
 
 	/* Allocate and initialize private info */
-	MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH_GIF_DEMUX,
+	priv = malloc(sizeof(*priv), M_NETGRAPH_GIF_DEMUX,
 	    M_NOWAIT | M_ZERO);
 	if (priv == NULL)
 		return (ENOMEM);
@@ -371,7 +371,7 @@ ng_gif_demux_shutdown(node_p node)
 {
 	const priv_p priv = NG_NODE_PRIVATE(node);
 
-	FREE(priv, M_NETGRAPH_GIF_DEMUX);
+	free(priv, M_NETGRAPH_GIF_DEMUX);
 	NG_NODE_SET_PRIVATE(node, NULL);
 	NG_NODE_UNREF(node);
 	return (0);
diff --git a/sys/netgraph/ng_hole.c b/sys/netgraph/ng_hole.c
index f3b8f8c..508ff13 100644
--- a/sys/netgraph/ng_hole.c
+++ b/sys/netgraph/ng_hole.c
@@ -132,7 +132,7 @@ ngh_newhook(node_p node, hook_p hook, const char *name)
 	hinfo_p hip;
 
 	/* Create hook private structure. */
-	MALLOC(hip, hinfo_p, sizeof(*hip), M_NETGRAPH, M_NOWAIT | M_ZERO);
+	hip = malloc(sizeof(*hip), M_NETGRAPH, M_NOWAIT | M_ZERO);
 	if (hip == NULL)
 		return (ENOMEM);
 	NG_HOOK_SET_PRIVATE(hook, hip);
@@ -219,7 +219,7 @@ static int
 ngh_disconnect(hook_p hook)
 {
 
-	FREE(NG_HOOK_PRIVATE(hook), M_NETGRAPH);
+	free(NG_HOOK_PRIVATE(hook), M_NETGRAPH);
 	NG_HOOK_SET_PRIVATE(hook, NULL);
 	if (NG_NODE_NUMHOOKS(NG_HOOK_NODE(hook)) == 0)
 		ng_rmnode_self(NG_HOOK_NODE(hook));
diff --git a/sys/netgraph/ng_iface.c b/sys/netgraph/ng_iface.c
index b216bfc..e86dfc8 100644
--- a/sys/netgraph/ng_iface.c
+++ b/sys/netgraph/ng_iface.c
@@ -511,12 +511,12 @@ ng_iface_constructor(node_p node)
 	priv_p priv;
 
 	/* Allocate node and interface private structures */
-	MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH_IFACE, M_NOWAIT|M_ZERO);
+	priv = malloc(sizeof(*priv), M_NETGRAPH_IFACE, M_NOWAIT|M_ZERO);
 	if (priv == NULL)
 		return (ENOMEM);
 	ifp = if_alloc(IFT_PROPVIRTUAL);
 	if (ifp == NULL) {
-		FREE(priv, M_NETGRAPH_IFACE);
+		free(priv, M_NETGRAPH_IFACE);
 		return (ENOMEM);
 	}
 
@@ -781,7 +781,7 @@ ng_iface_shutdown(node_p node)
 	CURVNET_RESTORE();
 	priv->ifp = NULL;
 	free_unr(V_ng_iface_unit, priv->unit);
-	FREE(priv, M_NETGRAPH_IFACE);
+	free(priv, M_NETGRAPH_IFACE);
 	NG_NODE_SET_PRIVATE(node, NULL);
 	NG_NODE_UNREF(node);
 	return (0);
diff --git a/sys/netgraph/ng_ipfw.c b/sys/netgraph/ng_ipfw.c
index f7c6662..91af215 100644
--- a/sys/netgraph/ng_ipfw.c
+++ b/sys/netgraph/ng_ipfw.c
@@ -162,7 +162,7 @@ ng_ipfw_newhook(node_p node, hook_p hook, const char *name)
 		return (EINVAL);
 
 	/* Allocate memory for this hook's private data */
-	MALLOC(hpriv, hpriv_p, sizeof(*hpriv), M_NETGRAPH, M_NOWAIT | M_ZERO);
+	hpriv = malloc(sizeof(*hpriv), M_NETGRAPH, M_NOWAIT | M_ZERO);
 	if (hpriv== NULL)
 		return (ENOMEM);
 
@@ -331,7 +331,7 @@ ng_ipfw_disconnect(hook_p hook)
 {
 	const hpriv_p hpriv = NG_HOOK_PRIVATE(hook);
 
-	FREE(hpriv, M_NETGRAPH);
+	free(hpriv, M_NETGRAPH);
 	NG_HOOK_SET_PRIVATE(hook, NULL);
 
 	return (0);
diff --git a/sys/netgraph/ng_ksocket.c b/sys/netgraph/ng_ksocket.c
index 43364f1..312b5ef 100644
--- a/sys/netgraph/ng_ksocket.c
+++ b/sys/netgraph/ng_ksocket.c
@@ -250,17 +250,17 @@ ng_ksocket_sockaddr_parse(const struct ng_parse_type *type,
 			return (EINVAL);
 		pathlen = strlen(path);
 		if (pathlen > SOCK_MAXADDRLEN) {
-			FREE(path, M_NETGRAPH_KSOCKET);
+			free(path, M_NETGRAPH_KSOCKET);
 			return (E2BIG);
 		}
 		if (*buflen < pathoff + pathlen) {
-			FREE(path, M_NETGRAPH_KSOCKET);
+			free(path, M_NETGRAPH_KSOCKET);
 			return (ERANGE);
 		}
 		*off += toklen;
 		bcopy(path, sun->sun_path, pathlen);
 		sun->sun_len = pathoff + pathlen;
-		FREE(path, M_NETGRAPH_KSOCKET);
+		free(path, M_NETGRAPH_KSOCKET);
 		break;
 	    }
 
@@ -335,7 +335,7 @@ ng_ksocket_sockaddr_unparse(const struct ng_parse_type *type,
 		if ((pathtoken = ng_encode_string(pathbuf, pathlen)) == NULL)
 			return (ENOMEM);
 		slen += snprintf(cbuf, cbuflen, "local/%s", pathtoken);
-		FREE(pathtoken, M_NETGRAPH_KSOCKET);
+		free(pathtoken, M_NETGRAPH_KSOCKET);
 		if (slen >= cbuflen)
 			return (ERANGE);
 		*off += sun->sun_len;
@@ -523,7 +523,7 @@ ng_ksocket_constructor(node_p node)
 	priv_p priv;
 
 	/* Allocate private structure */
-	MALLOC(priv, priv_p, sizeof(*priv),
+	priv = malloc(sizeof(*priv),
 	    M_NETGRAPH_KSOCKET, M_NOWAIT | M_ZERO);
 	if (priv == NULL)
 		return (ENOMEM);
@@ -811,7 +811,7 @@ ng_ksocket_rcvmsg(node_p node, item_p item, hook_p lasthook)
 		bail:
 			/* Cleanup */
 			if (sa != NULL)
-				FREE(sa, M_SONAME);
+				free(sa, M_SONAME);
 			break;
 		    }
 
@@ -965,7 +965,7 @@ ng_ksocket_shutdown(node_p node)
 
 	/* Take down netgraph node */
 	bzero(priv, sizeof(*priv));
-	FREE(priv, M_NETGRAPH_KSOCKET);
+	free(priv, M_NETGRAPH_KSOCKET);
 	NG_NODE_SET_PRIVATE(node, NULL);
 	NG_NODE_UNREF(node);		/* let the node escape */
 	return (0);
@@ -1105,7 +1105,7 @@ ng_ksocket_incoming2(node_p node, hook_p hook, void *arg1, int arg2)
 		/* See if we got anything */
 		if (m == NULL) {
 			if (sa != NULL)
-				FREE(sa, M_SONAME);
+				free(sa, M_SONAME);
 			break;
 		}
 
@@ -1130,11 +1130,11 @@ ng_ksocket_incoming2(node_p node, hook_p hook, void *arg1, int arg2)
 			    NG_KSOCKET_TAG_SOCKADDR, sizeof(ng_ID_t) +
 			    sa->sa_len, M_NOWAIT);
 			if (stag == NULL) {
-				FREE(sa, M_SONAME);
+				free(sa, M_SONAME);
 				goto sendit;
 			}
 			bcopy(sa, &stag->sa, sa->sa_len);
-			FREE(sa, M_SONAME);
+			free(sa, M_SONAME);
 			stag->id = NG_NODE_ID(node);
 			m_tag_prepend(m, &stag->tag);
 		}
@@ -1234,14 +1234,14 @@ ng_ksocket_finish_accept(priv_p priv)
 	/* Clone a ksocket node to wrap the new socket */
         error = ng_make_node_common(&ng_ksocket_typestruct, &node);
         if (error) {
-		FREE(resp, M_NETGRAPH);
+		free(resp, M_NETGRAPH);
 		soclose(so);
 		goto out;
 	}
 
 	if (ng_ksocket_constructor(node) != 0) {
 		NG_NODE_UNREF(node);
-		FREE(resp, M_NETGRAPH);
+		free(resp, M_NETGRAPH);
 		soclose(so);
 		goto out;
 	}
@@ -1276,7 +1276,7 @@ ng_ksocket_finish_accept(priv_p priv)
 
 out:
 	if (sa != NULL)
-		FREE(sa, M_SONAME);
+		free(sa, M_SONAME);
 }
 
 /*
diff --git a/sys/netgraph/ng_l2tp.c b/sys/netgraph/ng_l2tp.c
index f035bea..46a817c 100644
--- a/sys/netgraph/ng_l2tp.c
+++ b/sys/netgraph/ng_l2tp.c
@@ -364,7 +364,7 @@ ng_l2tp_constructor(node_p node)
 	int	i;
 
 	/* Allocate private structure */
-	MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH_L2TP, M_NOWAIT | M_ZERO);
+	priv = malloc(sizeof(*priv), M_NETGRAPH_L2TP, M_NOWAIT | M_ZERO);
 	if (priv == NULL)
 		return (ENOMEM);
 	NG_NODE_SET_PRIVATE(node, priv);
@@ -428,8 +428,7 @@ ng_l2tp_newhook(node_p node, hook_p hook, const char *name)
 			return (EINVAL);
 
 		/* Create hook private structure */
-		MALLOC(hpriv, hookpriv_p,
-		    sizeof(*hpriv), M_NETGRAPH_L2TP, M_NOWAIT | M_ZERO);
+		hpriv = malloc(		    sizeof(*hpriv), M_NETGRAPH_L2TP, M_NOWAIT | M_ZERO);
 		if (hpriv == NULL)
 			return (ENOMEM);
 		hpriv->conf.session_id = session_id;
@@ -667,7 +666,7 @@ ng_l2tp_shutdown(node_p node)
 
 	mtx_destroy(&seq->mtx);
 
-	FREE(priv, M_NETGRAPH_L2TP);
+	free(priv, M_NETGRAPH_L2TP);
 
 	/* Unref node */
 	NG_NODE_UNREF(node);
@@ -691,7 +690,7 @@ ng_l2tp_disconnect(hook_p hook)
 	else {
 		const hookpriv_p hpriv = NG_HOOK_PRIVATE(hook);
 		LIST_REMOVE(hpriv, sessions);
-		FREE(hpriv, M_NETGRAPH_L2TP);
+		free(hpriv, M_NETGRAPH_L2TP);
 		NG_HOOK_SET_PRIVATE(hook, NULL);
 	}
 
diff --git a/sys/netgraph/ng_lmi.c b/sys/netgraph/ng_lmi.c
index 105ba7e..9de32ce 100644
--- a/sys/netgraph/ng_lmi.c
+++ b/sys/netgraph/ng_lmi.c
@@ -185,7 +185,7 @@ nglmi_constructor(node_p node)
 {
 	sc_p sc;
 
-	MALLOC(sc, sc_p, sizeof(*sc), M_NETGRAPH, M_NOWAIT | M_ZERO);
+	sc = malloc(sizeof(*sc), M_NETGRAPH, M_NOWAIT | M_ZERO);
 	if (sc == NULL)
 		return (ENOMEM);
 
@@ -1053,7 +1053,7 @@ nglmi_shutdown(node_p node)
 
 	NG_NODE_SET_PRIVATE(node, NULL);
 	NG_NODE_UNREF(sc->node);
-	FREE(sc, M_NETGRAPH);
+	free(sc, M_NETGRAPH);
 	return (0);
 }
 
diff --git a/sys/netgraph/ng_message.h b/sys/netgraph/ng_message.h
index 7d0f4d8..819397a 100644
--- a/sys/netgraph/ng_message.h
+++ b/sys/netgraph/ng_message.h
@@ -388,7 +388,7 @@ struct flow_manager {
  */
 #define NG_MKMESSAGE(msg, cookie, cmdid, len, how)			\
 	do {								\
-	  MALLOC((msg), struct ng_mesg *, sizeof(struct ng_mesg)	\
+	  (msg) = malloc(sizeof(struct ng_mesg)				\
 	    + (len), M_NETGRAPH_MSG, (how) | M_ZERO);			\
 	  if ((msg) == NULL)						\
 	    break;							\
@@ -406,7 +406,7 @@ struct flow_manager {
  */
 #define NG_MKRESPONSE(rsp, msg, len, how)				\
 	do {								\
-	  MALLOC((rsp), struct ng_mesg *, sizeof(struct ng_mesg)	\
+	  (rsp) = malloc(sizeof(struct ng_mesg)				\
 	    + (len), M_NETGRAPH_MSG, (how) | M_ZERO);			\
 	  if ((rsp) == NULL)						\
 	    break;							\
@@ -425,8 +425,8 @@ struct flow_manager {
  */
 #define	NG_COPYMESSAGE(copy, msg, how)					\
 	do {								\
-	  MALLOC((copy), struct ng_mesg *, sizeof(struct ng_mesg) +	\
-	    (msg)->header.arglen, M_NETGRAPH_MSG, (how) | M_ZERO);	\
+	  (copy) = malloc(sizeof(struct ng_mesg)			\
+	    + (msg)->header.arglen, M_NETGRAPH_MSG, (how) | M_ZERO);	\
 	  if ((copy) == NULL)						\
 	    break;							\
 	  (copy)->header.version = NG_VERSION;				\
diff --git a/sys/netgraph/ng_mppc.c b/sys/netgraph/ng_mppc.c
index 0cf1e72..2a7198f 100644
--- a/sys/netgraph/ng_mppc.c
+++ b/sys/netgraph/ng_mppc.c
@@ -200,7 +200,7 @@ ng_mppc_constructor(node_p node)
 	priv_p priv;
 
 	/* Allocate private structure */
-	MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH_MPPC, M_NOWAIT | M_ZERO);
+	priv = malloc(sizeof(*priv), M_NETGRAPH_MPPC, M_NOWAIT | M_ZERO);
 	if (priv == NULL)
 		return (ENOMEM);
 
@@ -291,12 +291,11 @@ ng_mppc_rcvmsg(node_p node, item_p item, hook_p lasthook)
 #ifdef NETGRAPH_MPPC_COMPRESSION
 			/* Initialize state buffers for compression */
 			if (d->history != NULL) {
-				FREE(d->history, M_NETGRAPH_MPPC);
+				free(d->history, M_NETGRAPH_MPPC);
 				d->history = NULL;
 			}
 			if ((cfg->bits & MPPC_BIT) != 0) {
-				MALLOC(d->history, u_char *,
-				    isComp ? MPPC_SizeOfCompressionHistory() :
+				d->history = malloc(				    isComp ? MPPC_SizeOfCompressionHistory() :
 				    MPPC_SizeOfDecompressionHistory(),
 				    M_NETGRAPH_MPPC, M_NOWAIT);
 				if (d->history == NULL)
@@ -421,12 +420,12 @@ ng_mppc_shutdown(node_p node)
 	/* Take down netgraph node */
 #ifdef NETGRAPH_MPPC_COMPRESSION
 	if (priv->xmit.history != NULL)
-		FREE(priv->xmit.history, M_NETGRAPH_MPPC);
+		free(priv->xmit.history, M_NETGRAPH_MPPC);
 	if (priv->recv.history != NULL)
-		FREE(priv->recv.history, M_NETGRAPH_MPPC);
+		free(priv->recv.history, M_NETGRAPH_MPPC);
 #endif
 	bzero(priv, sizeof(*priv));
-	FREE(priv, M_NETGRAPH_MPPC);
+	free(priv, M_NETGRAPH_MPPC);
 	NG_NODE_SET_PRIVATE(node, NULL);
 	NG_NODE_UNREF(node);		/* let the node escape */
 	return (0);
diff --git a/sys/netgraph/ng_nat.c b/sys/netgraph/ng_nat.c
index 9e605da..cc69b14 100644
--- a/sys/netgraph/ng_nat.c
+++ b/sys/netgraph/ng_nat.c
@@ -272,7 +272,7 @@ ng_nat_constructor(node_p node)
 	priv_p priv;
 
 	/* Initialize private descriptor. */
-	MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH,
+	priv = malloc(sizeof(*priv), M_NETGRAPH,
 		M_NOWAIT | M_ZERO);
 	if (priv == NULL)
 		return (ENOMEM);
@@ -280,7 +280,7 @@ ng_nat_constructor(node_p node)
 	/* Init aliasing engine. */
 	priv->lib = LibAliasInit(NULL);
 	if (priv->lib == NULL) {
-		FREE(priv, M_NETGRAPH);
+		free(priv, M_NETGRAPH);
 		return (ENOMEM);
 	}
 
@@ -408,7 +408,7 @@ ng_nat_rcvmsg(node_p node, item_p item, hook_p lasthook)
 
 			if (entry->lnk == NULL) {
 				error = ENOMEM;
-				FREE(entry, M_NETGRAPH);
+				free(entry, M_NETGRAPH);
 				break;
 			}
 
@@ -464,7 +464,7 @@ ng_nat_rcvmsg(node_p node, item_p item, hook_p lasthook)
 
 			if (entry->lnk == NULL) {
 				error = ENOMEM;
-				FREE(entry, M_NETGRAPH);
+				free(entry, M_NETGRAPH);
 				break;
 			}
 
@@ -517,7 +517,7 @@ ng_nat_rcvmsg(node_p node, item_p item, hook_p lasthook)
 
 			if (entry->lnk == NULL) {
 				error = ENOMEM;
-				FREE(entry, M_NETGRAPH);
+				free(entry, M_NETGRAPH);
 				break;
 			}
 
@@ -583,7 +583,7 @@ ng_nat_rcvmsg(node_p node, item_p item, hook_p lasthook)
 			/* Delete entry from our internal list. */
 			priv->rdrcount--;
 			STAILQ_REMOVE(&priv->redirhead, entry, ng_nat_rdr_lst, entries);
-			FREE(entry, M_NETGRAPH);
+			free(entry, M_NETGRAPH);
 		    }
 			break;
 		case NGM_NAT_ADD_SERVER:
@@ -785,12 +785,12 @@ ng_nat_shutdown(node_p node)
 	while (!STAILQ_EMPTY(&priv->redirhead)) {
 		struct ng_nat_rdr_lst *entry = STAILQ_FIRST(&priv->redirhead);
 		STAILQ_REMOVE_HEAD(&priv->redirhead, entries);
-		FREE(entry, M_NETGRAPH);
+		free(entry, M_NETGRAPH);
 	};
 
 	/* Final free. */
 	LibAliasUninit(priv->lib);
-	FREE(priv, M_NETGRAPH);
+	free(priv, M_NETGRAPH);
 
 	return (0);
 }
diff --git a/sys/netgraph/ng_one2many.c b/sys/netgraph/ng_one2many.c
index ca742b3..6b88730 100644
--- a/sys/netgraph/ng_one2many.c
+++ b/sys/netgraph/ng_one2many.c
@@ -187,7 +187,7 @@ ng_one2many_constructor(node_p node)
 	priv_p priv;
 
 	/* Allocate and initialize private info */
-	MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_NOWAIT | M_ZERO);
+	priv = malloc(sizeof(*priv), M_NETGRAPH, M_NOWAIT | M_ZERO);
 	if (priv == NULL)
 		return (ENOMEM);
 	priv->conf.xmitAlg = NG_ONE2MANY_XMIT_ROUNDROBIN;
@@ -501,7 +501,7 @@ ng_one2many_shutdown(node_p node)
 
 	KASSERT(priv->numActiveMany == 0,
 	    ("%s: numActiveMany=%d", __func__, priv->numActiveMany));
-	FREE(priv, M_NETGRAPH);
+	free(priv, M_NETGRAPH);
 	NG_NODE_SET_PRIVATE(node, NULL);
 	NG_NODE_UNREF(node);
 	return (0);
diff --git a/sys/netgraph/ng_parse.c b/sys/netgraph/ng_parse.c
index 2c46d5c..1215df1 100644
--- a/sys/netgraph/ng_parse.c
+++ b/sys/netgraph/ng_parse.c
@@ -740,7 +740,7 @@ ng_string_parse(const struct ng_parse_type *type,
 		return (EINVAL);
 	*off += len;
 	bcopy(sval, buf, slen + 1);
-	FREE(sval, M_NETGRAPH_PARSE);
+	free(sval, M_NETGRAPH_PARSE);
 	*buflen = slen + 1;
 	return (0);
 }
@@ -756,11 +756,11 @@ ng_string_unparse(const struct ng_parse_type *type,
 	if (s == NULL)
 		return (ENOMEM);
 	if ((error = ng_parse_append(&cbuf, &cbuflen, "%s", s)) != 0) {
-		FREE(s, M_NETGRAPH_PARSE);
+		free(s, M_NETGRAPH_PARSE);
 		return (error);
 	}
 	*off += strlen(raw) + 1;
-	FREE(s, M_NETGRAPH_PARSE);
+	free(s, M_NETGRAPH_PARSE);
 	return (0);
 }
 
@@ -803,12 +803,12 @@ ng_fixedstring_parse(const struct ng_parse_type *type,
 	if ((sval = ng_get_string_token(s, off, &len, &slen)) == NULL)
 		return (EINVAL);
 	if (slen + 1 > fi->bufSize) {
-		FREE(sval, M_NETGRAPH_PARSE);
+		free(sval, M_NETGRAPH_PARSE);
 		return (E2BIG);
 	}
 	*off += len;
 	bcopy(sval, buf, slen);
-	FREE(sval, M_NETGRAPH_PARSE);
+	free(sval, M_NETGRAPH_PARSE);
 	bzero(buf + slen, fi->bufSize - slen);
 	*buflen = fi->bufSize;
 	return (0);
@@ -906,13 +906,13 @@ ng_sizedstring_parse(const struct ng_parse_type *type,
 	if ((sval = ng_get_string_token(s, off, &len, &slen)) == NULL)
 		return (EINVAL);
 	if (slen > USHRT_MAX) {
-		FREE(sval, M_NETGRAPH_PARSE);
+		free(sval, M_NETGRAPH_PARSE);
 		return (EINVAL);
 	}
 	*off += len;
 	*((u_int16_t *)buf) = (u_int16_t)slen;
 	bcopy(sval, buf + 2, slen);
-	FREE(sval, M_NETGRAPH_PARSE);
+	free(sval, M_NETGRAPH_PARSE);
 	*buflen = 2 + slen;
 	return (0);
 }
@@ -929,10 +929,10 @@ ng_sizedstring_unparse(const struct ng_parse_type *type,
 	if (s == NULL)
 		return (ENOMEM);
 	if ((error = ng_parse_append(&cbuf, &cbuflen, "%s", s)) != 0) {
-		FREE(s, M_NETGRAPH_PARSE);
+		free(s, M_NETGRAPH_PARSE);
 		return (error);
 	}
-	FREE(s, M_NETGRAPH_PARSE);
+	free(s, M_NETGRAPH_PARSE);
 	*off += slen + 2;
 	return (0);
 }
@@ -1117,16 +1117,16 @@ ng_bytearray_parse(const struct ng_parse_type *type,
 
 		arraylen = (*getLength)(type, start, buf);
 		if (arraylen > *buflen) {
-			FREE(str, M_NETGRAPH_PARSE);
+			free(str, M_NETGRAPH_PARSE);
 			return (ERANGE);
 		}
 		if (slen > arraylen) {
-			FREE(str, M_NETGRAPH_PARSE);
+			free(str, M_NETGRAPH_PARSE);
 			return (E2BIG);
 		}
 		bcopy(str, buf, slen);
 		bzero(buf + slen, arraylen - slen);
-		FREE(str, M_NETGRAPH_PARSE);
+		free(str, M_NETGRAPH_PARSE);
 		*off += toklen;
 		*buflen = arraylen;
 		return (0);
@@ -1219,7 +1219,7 @@ ng_parse_composite(const struct ng_parse_type *type, const char *s,
 	int align, len, blen, error = 0;
 
 	/* Initialize */
-	MALLOC(foff, int *, num * sizeof(*foff), M_NETGRAPH_PARSE, M_NOWAIT | M_ZERO);
+	foff = malloc(num * sizeof(*foff), M_NETGRAPH_PARSE, M_NOWAIT | M_ZERO);
 	if (foff == NULL) {
 		error = ENOMEM;
 		goto done;
@@ -1375,7 +1375,7 @@ gotIndex:
 	*buflen = blen;
 done:
 	if (foff != NULL)
-		FREE(foff, M_NETGRAPH_PARSE);
+		free(foff, M_NETGRAPH_PARSE);
 	return (error);
 }
 
@@ -1395,7 +1395,7 @@ ng_unparse_composite(const struct ng_parse_type *type, const u_char *data,
 	u_char *workBuf;
 
 	/* Get workspace for checking default values */
-	MALLOC(workBuf, u_char *, workSize, M_NETGRAPH_PARSE, M_NOWAIT);
+	workBuf = malloc(workSize, M_NETGRAPH_PARSE, M_NOWAIT);
 	if (workBuf == NULL)
 		return (ENOMEM);
 
@@ -1453,7 +1453,7 @@ ng_unparse_composite(const struct ng_parse_type *type, const u_char *data,
 		/* Print value */
 		if ((error = INVOKE(etype, unparse)
 		    (etype, data, off, cbuf, cbuflen)) != 0) {
-			FREE(workBuf, M_NETGRAPH_PARSE);
+			free(workBuf, M_NETGRAPH_PARSE);
 			return (error);
 		}
 		cbuflen -= strlen(cbuf);
@@ -1467,7 +1467,7 @@ ng_unparse_composite(const struct ng_parse_type *type, const u_char *data,
 
 fail:
 	/* Clean up after failure */
-	FREE(workBuf, M_NETGRAPH_PARSE);
+	free(workBuf, M_NETGRAPH_PARSE);
 	return (error);
 }
 
@@ -1717,7 +1717,7 @@ ng_parse_get_token(const char *s, int *startp, int *lenp)
 	case '"':
 		if ((t = ng_get_string_token(s, startp, lenp, NULL)) == NULL)
 			return T_ERROR;
-		FREE(t, M_NETGRAPH_PARSE);
+		free(t, M_NETGRAPH_PARSE);
 		return T_STRING;
 	default:
 		for (i = *startp + 1; s[i] != '\0' && !isspace(s[i])
@@ -1745,7 +1745,7 @@ ng_get_string_token(const char *s, int *startp, int *lenp, int *slenp)
 	start = *startp;
 	if (s[*startp] != '"')
 		return (NULL);
-	MALLOC(cbuf, char *, strlen(s + start), M_NETGRAPH_PARSE, M_NOWAIT);
+	cbuf = malloc(strlen(s + start), M_NETGRAPH_PARSE, M_NOWAIT);
 	if (cbuf == NULL)
 		return (NULL);
 	strcpy(cbuf, s + start + 1);
@@ -1812,7 +1812,7 @@ ng_get_string_token(const char *s, int *startp, int *lenp, int *slenp)
 			strcpy(p, v);
 		}
 	}
-	FREE(cbuf, M_NETGRAPH_PARSE);
+	free(cbuf, M_NETGRAPH_PARSE);
 	return (NULL);		/* no closing quote */
 }
 
@@ -1828,7 +1828,7 @@ ng_encode_string(const char *raw, int slen)
 	int off = 0;
 	int i;
 
-	MALLOC(cbuf, char *, strlen(raw) * 4 + 3, M_NETGRAPH_PARSE, M_NOWAIT);
+	cbuf = malloc(strlen(raw) * 4 + 3, M_NETGRAPH_PARSE, M_NOWAIT);
 	if (cbuf == NULL)
 		return (NULL);
 	cbuf[off++] = '"';
diff --git a/sys/netgraph/ng_pipe.c b/sys/netgraph/ng_pipe.c
index 071927a..b12318a 100644
--- a/sys/netgraph/ng_pipe.c
+++ b/sys/netgraph/ng_pipe.c
@@ -261,7 +261,7 @@ ngp_constructor(node_p node)
 {
 	priv_p priv;
 
-	MALLOC(priv, priv_p, sizeof(*priv), M_NG_PIPE, M_ZERO | M_NOWAIT);
+	priv = malloc(sizeof(*priv), M_NG_PIPE, M_ZERO | M_NOWAIT);
 	if (priv == NULL)
 		return (ENOMEM);
 	NG_NODE_SET_PRIVATE(node, priv);
@@ -439,7 +439,7 @@ parse_cfg(struct ng_pipe_hookcfg *current, struct ng_pipe_hookcfg *new,
 	if (new->ber == -1) {
 		current->ber = 0;
 		if (hinfo->ber_p) {
-			FREE(hinfo->ber_p, M_NG_PIPE);
+			free(hinfo->ber_p, M_NG_PIPE);
 			hinfo->ber_p = NULL;
 		}
 	} else if (new->ber >= 1 && new->ber <= 1000000000000) {
@@ -448,7 +448,7 @@ parse_cfg(struct ng_pipe_hookcfg *current, struct ng_pipe_hookcfg *new,
 		uint32_t fsize, i;
 
 		if (hinfo->ber_p == NULL)
-			MALLOC(hinfo->ber_p, uint64_t *, \
+			hinfo->ber_p = malloc(\
 				(MAX_FSIZE + MAX_OHSIZE)*sizeof(uint64_t), \
 				M_NG_PIPE, M_NOWAIT);
 		current->ber = new->ber;
@@ -959,7 +959,7 @@ ngp_shutdown(node_p node)
 			ng_rmhook_self(priv->lower.hook);
 	}
 	NG_NODE_UNREF(node);
-	FREE(priv, M_NG_PIPE);
+	free(priv, M_NG_PIPE);
 	return (0);
 }
 
@@ -1014,7 +1014,7 @@ ngp_disconnect(hook_p hook)
 
 	/* Release the packet loss probability table (BER) */
 	if (hinfo->ber_p)
-		FREE(hinfo->ber_p, M_NG_PIPE);
+		free(hinfo->ber_p, M_NG_PIPE);
 
 	mtx_unlock(&ng_pipe_giant);
 
diff --git a/sys/netgraph/ng_ppp.c b/sys/netgraph/ng_ppp.c
index b83b78f..ec5d62b 100644
--- a/sys/netgraph/ng_ppp.c
+++ b/sys/netgraph/ng_ppp.c
@@ -490,7 +490,7 @@ ng_ppp_constructor(node_p node)
 	int i;
 
 	/* Allocate private structure */
-	MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH_PPP, M_NOWAIT | M_ZERO);
+	priv = malloc(sizeof(*priv), M_NETGRAPH_PPP, M_NOWAIT | M_ZERO);
 	if (priv == NULL)
 		return (ENOMEM);
 
@@ -743,7 +743,7 @@ ng_ppp_shutdown(node_p node)
 	mtx_destroy(&priv->rmtx);
 	mtx_destroy(&priv->xmtx);
 	bzero(priv, sizeof(*priv));
-	FREE(priv, M_NETGRAPH_PPP);
+	free(priv, M_NETGRAPH_PPP);
 	NG_NODE_SET_PRIVATE(node, NULL);
 	NG_NODE_UNREF(node);		/* let the node escape */
 	return (0);
diff --git a/sys/netgraph/ng_pptpgre.c b/sys/netgraph/ng_pptpgre.c
index bb7a589..5c5d128 100644
--- a/sys/netgraph/ng_pptpgre.c
+++ b/sys/netgraph/ng_pptpgre.c
@@ -280,7 +280,7 @@ ng_pptpgre_constructor(node_p node)
 	int i;
 
 	/* Allocate private structure */
-	MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_NOWAIT | M_ZERO);
+	priv = malloc(sizeof(*priv), M_NETGRAPH, M_NOWAIT | M_ZERO);
 	if (priv == NULL)
 		return (ENOMEM);
 
@@ -519,7 +519,7 @@ ng_pptpgre_shutdown(node_p node)
 	LIST_REMOVE(&priv->uppersess, sessions);
 	mtx_destroy(&priv->uppersess.mtx);
 
-	FREE(priv, M_NETGRAPH);
+	free(priv, M_NETGRAPH);
 
 	/* Decrement ref count */
 	NG_NODE_UNREF(node);
diff --git a/sys/netgraph/ng_rfc1490.c b/sys/netgraph/ng_rfc1490.c
index 52a89a3..99f8641 100644
--- a/sys/netgraph/ng_rfc1490.c
+++ b/sys/netgraph/ng_rfc1490.c
@@ -165,7 +165,7 @@ ng_rfc1490_constructor(node_p node)
 	priv_p priv;
 
 	/* Allocate private structure */
-	MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_NOWAIT | M_ZERO);
+	priv = malloc(sizeof(*priv), M_NETGRAPH, M_NOWAIT | M_ZERO);
 	if (priv == NULL)
 		return (ENOMEM);
 
@@ -459,7 +459,7 @@ ng_rfc1490_shutdown(node_p node)
 
 	/* Take down netgraph node */
 	bzero(priv, sizeof(*priv));
-	FREE(priv, M_NETGRAPH);
+	free(priv, M_NETGRAPH);
 	NG_NODE_SET_PRIVATE(node, NULL);
 	NG_NODE_UNREF(node);		/* let the node escape */
 	return (0);
diff --git a/sys/netgraph/ng_sample.c b/sys/netgraph/ng_sample.c
index 63b3f0b..38b86d3 100644
--- a/sys/netgraph/ng_sample.c
+++ b/sys/netgraph/ng_sample.c
@@ -154,7 +154,7 @@ ng_xxx_constructor(node_p node)
 	int i;
 
 	/* Initialize private descriptor */
-	MALLOC(privdata, xxx_p, sizeof(*privdata), M_NETGRAPH,
+	privdata = malloc(sizeof(*privdata), M_NETGRAPH,
 		M_NOWAIT | M_ZERO);
 	if (privdata == NULL)
 		return (ENOMEM);
@@ -424,7 +424,7 @@ ng_xxx_shutdown(node_p node)
 #ifndef PERSISTANT_NODE
 	NG_NODE_SET_PRIVATE(node, NULL);
 	NG_NODE_UNREF(node);
-	FREE(privdata, M_NETGRAPH);
+	free(privdata, M_NETGRAPH);
 #else
 	if (node->nd_flags & NGF_REALLY_DIE) {
 		/*
@@ -434,7 +434,7 @@ ng_xxx_shutdown(node_p node)
 		 */
 		NG_NODE_SET_PRIVATE(node, NULL);
 		NG_NODE_UNREF(privdata->node);
-		FREE(privdata, M_NETGRAPH);
+		free(privdata, M_NETGRAPH);
 		return (0);
 	}
 	NG_NODE_REVIVE(node);		/* tell ng_rmnode() we will persist */
diff --git a/sys/netgraph/ng_split.c b/sys/netgraph/ng_split.c
index b7168f4..b4f2ee0 100644
--- a/sys/netgraph/ng_split.c
+++ b/sys/netgraph/ng_split.c
@@ -85,7 +85,7 @@ ng_split_constructor(node_p node)
 	priv_p		priv;
 
 	/* Allocate node */
-	MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_ZERO | M_NOWAIT);
+	priv = malloc(sizeof(*priv), M_NETGRAPH, M_ZERO | M_NOWAIT);
 	if (priv == NULL)
 		return (ENOMEM);
 
@@ -155,7 +155,7 @@ ng_split_shutdown(node_p node)
 
 	NG_NODE_SET_PRIVATE(node, NULL);
 	NG_NODE_UNREF(node);
-	FREE(priv, M_NETGRAPH);
+	free(priv, M_NETGRAPH);
 
 	return (0);
 }
diff --git a/sys/netgraph/ng_sppp.c b/sys/netgraph/ng_sppp.c
index 988de2e..5276f4f 100644
--- a/sys/netgraph/ng_sppp.c
+++ b/sys/netgraph/ng_sppp.c
@@ -121,8 +121,8 @@ ng_sppp_get_unit (int *unit)
 		int newlen;
 		
 		newlen = (2 * ng_sppp_units_len) + sizeof (*ng_sppp_units);
-		MALLOC (newarray, unsigned char *,
-		    newlen * sizeof (*ng_sppp_units), M_NETGRAPH_SPPP, M_NOWAIT);
+		newarray = malloc (newlen * sizeof (*ng_sppp_units),
+		    M_NETGRAPH_SPPP, M_NOWAIT);
 		if (newarray == NULL)
 			return (ENOMEM);
 		bcopy (ng_sppp_units, newarray,
@@ -130,7 +130,7 @@ ng_sppp_get_unit (int *unit)
 		bzero (newarray + ng_sppp_units_len,
 		    newlen - ng_sppp_units_len);
 		if (ng_sppp_units != NULL)
-			FREE (ng_sppp_units, M_NETGRAPH_SPPP);
+			free (ng_sppp_units, M_NETGRAPH_SPPP);
 		ng_sppp_units = newarray;
 		ng_sppp_units_len = newlen;
 	}
@@ -163,7 +163,7 @@ ng_sppp_free_unit (int unit)
 
 	ng_units_in_use--;
 	if (ng_units_in_use == 0) {
-		FREE (ng_sppp_units, M_NETGRAPH_SPPP);
+		free (ng_sppp_units, M_NETGRAPH_SPPP);
 		ng_sppp_units_len = 0;
 		ng_sppp_units = NULL;
 	}
@@ -248,13 +248,13 @@ ng_sppp_constructor (node_p node)
 	int error = 0;
 
 	/* Allocate node and interface private structures */
-	MALLOC (priv, priv_p, sizeof(*priv), M_NETGRAPH_SPPP, M_NOWAIT|M_ZERO);
+	priv = malloc (sizeof(*priv), M_NETGRAPH_SPPP, M_NOWAIT|M_ZERO);
 	if (priv == NULL)
 		return (ENOMEM);
 
 	ifp = if_alloc(IFT_PPP);
 	if (ifp == NULL) {
-		FREE (priv, M_NETGRAPH_SPPP);
+		free (priv, M_NETGRAPH_SPPP);
 		return (ENOSPC);
 	}
 	pp = IFP2SP(ifp);
@@ -265,8 +265,8 @@ ng_sppp_constructor (node_p node)
 
 	/* Get an interface unit number */
 	if ((error = ng_sppp_get_unit(&priv->unit)) != 0) {
-		FREE (pp, M_NETGRAPH_SPPP);
-		FREE (priv, M_NETGRAPH_SPPP);
+		free (pp, M_NETGRAPH_SPPP);
+		free (priv, M_NETGRAPH_SPPP);
 		return (error);
 	}
 
@@ -401,7 +401,7 @@ ng_sppp_shutdown (node_p node)
 	if_detach (priv->ifp);
 	if_free(priv->ifp);
 	ng_sppp_free_unit (priv->unit);
-	FREE (priv, M_NETGRAPH_SPPP);
+	free (priv, M_NETGRAPH_SPPP);
 	NG_NODE_SET_PRIVATE (node, NULL);
 	NG_NODE_UNREF (node);
 	return (0);
diff --git a/sys/netgraph/ng_tag.c b/sys/netgraph/ng_tag.c
index 3fd908a..b183285 100644
--- a/sys/netgraph/ng_tag.c
+++ b/sys/netgraph/ng_tag.c
@@ -303,7 +303,7 @@ ng_tag_newhook(node_p node, hook_p hook, const char *name)
 	int error;
 
 	/* Create hook private structure. */
-	MALLOC(hip, hinfo_p, sizeof(*hip), M_NETGRAPH_TAG, M_WAITOK | M_ZERO);
+	hip = malloc(sizeof(*hip), M_NETGRAPH_TAG, M_WAITOK | M_ZERO);
 	/* M_WAITOK can't return NULL. */
 	NG_HOOK_SET_PRIVATE(hook, hip);
 
@@ -316,13 +316,13 @@ ng_tag_newhook(node_p node, hook_p hook, const char *name)
 
 	/* Attach the default IN data. */
 	if ((error = ng_tag_setdata_in(hook, &ng_tag_default_in)) != 0) {
-		FREE(hip, M_NETGRAPH_TAG);
+		free(hip, M_NETGRAPH_TAG);
 		return (error);
 	}
 
 	/* Attach the default OUT data. */
 	if ((error = ng_tag_setdata_out(hook, &ng_tag_default_out)) != 0) {
-		FREE(hip, M_NETGRAPH_TAG);
+		free(hip, M_NETGRAPH_TAG);
 		return (error);
 	}
 
@@ -621,9 +621,9 @@ ng_tag_disconnect(hook_p hook)
 			priv->hi_nonmatch = NULL;
 	}
 
-	FREE(hip->in, M_NETGRAPH_TAG);
-	FREE(hip->out, M_NETGRAPH_TAG);
-	FREE(hip, M_NETGRAPH_TAG);
+	free(hip->in, M_NETGRAPH_TAG);
+	free(hip->out, M_NETGRAPH_TAG);
+	free(hip, M_NETGRAPH_TAG);
 	NG_HOOK_SET_PRIVATE(hook, NULL);			/* for good measure */
 	if ((NG_NODE_NUMHOOKS(NG_HOOK_NODE(hook)) == 0) &&
 	    (NG_NODE_IS_VALID(NG_HOOK_NODE(hook)))) {
@@ -648,13 +648,13 @@ ng_tag_setdata_in(hook_p hook, const struct ng_tag_hookin *hp0)
 
 	/* Make a copy of the tag values and data. */
 	size = NG_TAG_HOOKIN_SIZE(hp0->tag_len);
-	MALLOC(hp, struct ng_tag_hookin *, size, M_NETGRAPH_TAG, M_WAITOK);
+	hp = malloc(size, M_NETGRAPH_TAG, M_WAITOK);
 	/* M_WAITOK can't return NULL. */
 	bcopy(hp0, hp, size);
 
 	/* Free previous tag, if any, and assign new one. */
 	if (hip->in != NULL)
-		FREE(hip->in, M_NETGRAPH_TAG);
+		free(hip->in, M_NETGRAPH_TAG);
 	hip->in = hp;
 
 	/*
@@ -698,13 +698,13 @@ ng_tag_setdata_out(hook_p hook, const struct ng_tag_hookout *hp0)
 
 	/* Make a copy of the tag values and data. */
 	size = NG_TAG_HOOKOUT_SIZE(hp0->tag_len);
-	MALLOC(hp, struct ng_tag_hookout *, size, M_NETGRAPH_TAG, M_WAITOK);
+	hp = malloc(size, M_NETGRAPH_TAG, M_WAITOK);
 	/* M_WAITOK can't return NULL. */
 	bcopy(hp0, hp, size);
 
 	/* Free previous tag, if any, and assign new one. */
 	if (hip->out != NULL)
-		FREE(hip->out, M_NETGRAPH_TAG);
+		free(hip->out, M_NETGRAPH_TAG);
 	hip->out = hp;
 
 	/* Fill internal values from API structures. */
diff --git a/sys/netgraph/ng_tcpmss.c b/sys/netgraph/ng_tcpmss.c
index ac951e6..bcc421a 100644
--- a/sys/netgraph/ng_tcpmss.c
+++ b/sys/netgraph/ng_tcpmss.c
@@ -159,7 +159,7 @@ ng_tcpmss_newhook(node_p node, hook_p hook, const char *name)
 {
 	hpriv_p priv;
 
-	MALLOC(priv, hpriv_p, sizeof(*priv), M_NETGRAPH, M_NOWAIT | M_ZERO);
+	priv = malloc(sizeof(*priv), M_NETGRAPH, M_NOWAIT | M_ZERO);
 	if (priv == NULL)
 		return (ENOMEM);
 
@@ -371,7 +371,7 @@ ng_tcpmss_disconnect(hook_p hook)
 			priv->outHook = NULL;
 	}
 
-	FREE(NG_HOOK_PRIVATE(hook), M_NETGRAPH);
+	free(NG_HOOK_PRIVATE(hook), M_NETGRAPH);
 
 	if (NG_NODE_NUMHOOKS(NG_HOOK_NODE(hook)) == 0)
 		ng_rmnode_self(NG_HOOK_NODE(hook));
diff --git a/sys/netgraph/ng_tee.c b/sys/netgraph/ng_tee.c
index 930dc6c..6ea1a4b 100644
--- a/sys/netgraph/ng_tee.c
+++ b/sys/netgraph/ng_tee.c
@@ -153,7 +153,7 @@ ng_tee_constructor(node_p node)
 {
 	sc_p privdata;
 
-	MALLOC(privdata, sc_p, sizeof(*privdata), M_NETGRAPH, M_NOWAIT|M_ZERO);
+	privdata = malloc(sizeof(*privdata), M_NETGRAPH, M_NOWAIT|M_ZERO);
 	if (privdata == NULL)
 		return (ENOMEM);
 
@@ -356,7 +356,7 @@ ng_tee_shutdown(node_p node)
 	const sc_p privdata = NG_NODE_PRIVATE(node);
 
 	NG_NODE_SET_PRIVATE(node, NULL);
-	FREE(privdata, M_NETGRAPH);
+	free(privdata, M_NETGRAPH);
 	NG_NODE_UNREF(node);
 	return (0);
 }
diff --git a/sys/netgraph/ng_tty.c b/sys/netgraph/ng_tty.c
index 2d2fa45..7616489 100644
--- a/sys/netgraph/ng_tty.c
+++ b/sys/netgraph/ng_tty.c
@@ -160,7 +160,7 @@ ngt_constructor(node_p node)
 	char name[sizeof(NG_TTY_NODE_TYPE) + 8];
 
 	/* Allocate private structure */
-	MALLOC(sc, sc_p, sizeof(*sc), M_NETGRAPH, M_NOWAIT | M_ZERO);
+	sc = malloc(sizeof(*sc), M_NETGRAPH, M_NOWAIT | M_ZERO);
 	if (sc == NULL)
 		return (ENOMEM);
 
@@ -250,7 +250,7 @@ ngt_shutdown(node_p node)
 	IF_DRAIN(&sc->outq);
 	mtx_destroy(&(sc)->outq.ifq_mtx);
 	NG_NODE_UNREF(sc->node);
-	FREE(sc, M_NETGRAPH);
+	free(sc, M_NETGRAPH);
 
 	return (0);
 }
diff --git a/sys/netgraph/ng_vjc.c b/sys/netgraph/ng_vjc.c
index ec70956..5714ac0 100644
--- a/sys/netgraph/ng_vjc.c
+++ b/sys/netgraph/ng_vjc.c
@@ -243,7 +243,7 @@ ng_vjc_constructor(node_p node)
 	priv_p priv;
 
 	/* Allocate private structure */
-	MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_NOWAIT | M_ZERO);
+	priv = malloc(sizeof(*priv), M_NETGRAPH, M_NOWAIT | M_ZERO);
 	if (priv == NULL)
 		return (ENOMEM);
 
@@ -545,7 +545,7 @@ ng_vjc_shutdown(node_p node)
 	const priv_p priv = NG_NODE_PRIVATE(node);
 
 	bzero(priv, sizeof(*priv));
-	FREE(priv, M_NETGRAPH);
+	free(priv, M_NETGRAPH);
 	NG_NODE_SET_PRIVATE(node, NULL);
 	NG_NODE_UNREF(node);
 	return (0);
diff --git a/sys/netgraph/ng_vlan.c b/sys/netgraph/ng_vlan.c
index cd57f7c..bd29929 100644
--- a/sys/netgraph/ng_vlan.c
+++ b/sys/netgraph/ng_vlan.c
@@ -161,7 +161,7 @@ ng_vlan_constructor(node_p node)
 	priv_p priv;
 	int i;
 
-	MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_NOWAIT | M_ZERO);
+	priv = malloc(sizeof(*priv), M_NETGRAPH, M_NOWAIT | M_ZERO);
 	if (priv == NULL)
 		return (ENOMEM);
 	for (i = 0; i < HASHSIZE; i++)
@@ -241,7 +241,7 @@ ng_vlan_rcvmsg(node_p node, item_p item, hook_p lasthook)
 				break;
 			}
 			/* Create filter. */
-			MALLOC(f, struct filter *, sizeof(*f),
+			f = malloc(sizeof(*f),
 			    M_NETGRAPH, M_NOWAIT | M_ZERO);
 			if (f == NULL) {
 				error = ENOMEM;
@@ -273,7 +273,7 @@ ng_vlan_rcvmsg(node_p node, item_p item, hook_p lasthook)
 			NG_HOOK_SET_PRIVATE(hook, NULL);
 			LIST_REMOVE(f, next);
 			priv->nent--;
-			FREE(f, M_NETGRAPH);
+			free(f, M_NETGRAPH);
 			break;
 		case NGM_VLAN_GET_TABLE:
 			NG_MKRESPONSE(resp, msg, sizeof(*t) +
@@ -438,7 +438,7 @@ ng_vlan_shutdown(node_p node)
 
 	NG_NODE_SET_PRIVATE(node, NULL);
 	NG_NODE_UNREF(node);
-	FREE(priv, M_NETGRAPH);
+	free(priv, M_NETGRAPH);
 	return (0);
 }
 
@@ -457,7 +457,7 @@ ng_vlan_disconnect(hook_p hook)
 		if ((f = NG_HOOK_PRIVATE(hook)) != NULL) {
 			LIST_REMOVE(f, next);
 			priv->nent--;
-			FREE(f, M_NETGRAPH);
+			free(f, M_NETGRAPH);
 		}
 	}
 	NG_HOOK_SET_PRIVATE(hook, NULL);