the netmpls code includes various headers it doesn't really need. Index: mpls.h =================================================================== RCS file: /cvs/src/sys/netmpls/mpls.h,v retrieving revision 1.25 diff -u -p -r1.25 mpls.h --- mpls.h 8 Sep 2010 08:00:56 -0000 1.25 +++ mpls.h 26 Mar 2013 08:05:43 -0000 @@ -35,7 +35,6 @@ #include <sys/param.h> #include <sys/time.h> -#include <sys/proc.h> #include <sys/queue.h> #include <net/if.h> Index: mpls_raw.c =================================================================== RCS file: /cvs/src/sys/netmpls/mpls_raw.c,v retrieving revision 1.8 diff -u -p -r1.8 mpls_raw.c --- mpls_raw.c 3 Sep 2010 13:12:31 -0000 1.8 +++ mpls_raw.c 26 Mar 2013 08:05:21 -0000 @@ -31,7 +31,6 @@ */ #include <sys/param.h> -#include <sys/malloc.h> #include <sys/mbuf.h> #include <sys/errno.h> #include <sys/protosw.h> @@ -39,12 +38,10 @@ #include <sys/socket.h> #include <sys/socketvar.h> #include <sys/systm.h> -#include <sys/proc.h> #include <sys/sysctl.h> #include <net/if.h> #include <net/if_types.h> -#include <net/route.h> #include <netmpls/mpls.h> Index: mpls_shim.c =================================================================== RCS file: /cvs/src/sys/netmpls/mpls_shim.c,v retrieving revision 1.6 diff -u -p -r1.6 mpls_shim.c --- mpls_shim.c 28 Jan 2009 22:18:44 -0000 1.6 +++ mpls_shim.c 26 Mar 2013 08:03:49 -0000 @@ -31,14 +31,12 @@ */ #include <sys/param.h> -#include <sys/malloc.h> #include <sys/mbuf.h> #include <sys/errno.h> #include <sys/socket.h> #include <sys/systm.h> #include <net/if.h> -#include <net/route.h> #include <netmpls/mpls.h>