diff --git a/lib/libnetgraph/debug.c b/lib/libnetgraph/debug.c
index 73d614daae35..dfc75f5268e4 100644
--- a/lib/libnetgraph/debug.c
+++ b/lib/libnetgraph/debug.c
@@ -59,30 +59,49 @@ __FBSDID("$FreeBSD$");
 
 #include <netgraph/ng_UI.h>
 #include <netgraph/ng_async.h>
+#include <netgraph/ng_atmllc.h>
 #include <netgraph/ng_bpf.h>
+#include <netgraph/ng_bridge.h>
 #include <netgraph/ng_cisco.h>
+#include <netgraph/ng_device.h>
 #include <netgraph/ng_echo.h>
+#include <netgraph/ng_eiface.h>
+#include <netgraph/ng_etf.h>
 #include <netgraph/ng_ether.h>
+#include <netgraph/ng_fec.h>
 #include <netgraph/ng_frame_relay.h>
+#include <netgraph/ng_gif.h>
+#include <netgraph/ng_gif_demux.h>
 #include <netgraph/ng_hole.h>
+#include <netgraph/ng_hub.h>
 #include <netgraph/ng_iface.h>
+#include <netgraph/ng_ip_input.h>
+#include <netgraph/ng_ipfw.h>
 #include <netgraph/ng_ksocket.h>
+#include <netgraph/ng_l2tp.h>
 #include <netgraph/ng_lmi.h>
+#include <netgraph/ng_mppc.h>
+#include <netgraph/ng_nat.h>
+#include <netgraph/ng_one2many.h>
 #include <netgraph/ng_ppp.h>
 #include <netgraph/ng_pppoe.h>
+#include <netgraph/ng_pptpgre.h>
 #include <netgraph/ng_rfc1490.h>
 #include <netgraph/ng_socket.h>
+#include <netgraph/ng_source.h>
+#include <netgraph/ng_split.h>
+#include <netgraph/ng_sppp.h>
+#include <netgraph/ng_tcpmss.h>
 #include <netgraph/ng_tee.h>
 #include <netgraph/ng_tty.h>
 #include <netgraph/ng_vjc.h>
+#include <netgraph/ng_vlan.h>
 #ifdef	WHISTLE
 #include <machine/../isa/df_def.h>
 #include <machine/../isa/if_wfra.h>
 #include <machine/../isa/ipac.h>
 #include <netgraph/ng_df.h>
 #include <netgraph/ng_ipac.h>
-#include <netgraph/ng_mppc.h>
-#include <netgraph/ng_pptpgre.h>
 #include <netgraph/ng_tn.h>
 #endif
 
@@ -108,28 +127,47 @@ struct ng_cookie {
 static const struct ng_cookie cookies[] = {
 	COOKIE(UI),
 	COOKIE(ASYNC),
+	COOKIE(ATMLLC),
 	COOKIE(BPF),
+	COOKIE(BRIDGE),
 	COOKIE(CISCO),
+	COOKIE(DEVICE),
 	COOKIE(ECHO),
+	COOKIE(EIFACE),
+	COOKIE(ETF),
 	COOKIE(ETHER),
+	COOKIE(FEC),
 	COOKIE(FRAMERELAY),
+	COOKIE(GIF),
+	COOKIE(GIF_DEMUX),
 	COOKIE(GENERIC),
 	COOKIE(HOLE),
+	COOKIE(HUB),
 	COOKIE(IFACE),
+	COOKIE(IP_INPUT),
+	COOKIE(IPFW),
 	COOKIE(KSOCKET),
+	COOKIE(L2TP),
 	COOKIE(LMI),
+	COOKIE(MPPC),
+	COOKIE(NAT),
+	COOKIE(ONE2MANY),
 	COOKIE(PPP),
 	COOKIE(PPPOE),
+	COOKIE(PPTPGRE),
 	COOKIE(RFC1490),
 	COOKIE(SOCKET),
+	COOKIE(SOURCE),
+	COOKIE(SPLIT),
+	COOKIE(SPPP),
+	COOKIE(TCPMSS),
 	COOKIE(TEE),
 	COOKIE(TTY),
 	COOKIE(VJC),
+	COOKIE(VLAN),
 #ifdef WHISTLE
 	COOKIE(DF),
 	COOKIE(IPAC),
-	COOKIE(MPPC),
-	COOKIE(PPTPGRE),
 	COOKIE(TN),
 	COOKIE(WFRA),
 #endif