Index: sys/conf/files
===================================================================
--- sys/conf/files	(revision 218217)
+++ sys/conf/files	(working copy)
@@ -960,7 +960,7 @@
 dev/e1000/e1000_82571.c		optional em | igb \
 	compile-with "${NORMAL_C} -I$S/dev/e1000"
 dev/e1000/e1000_82575.c		optional em | igb \
-	 compile-with "${NORMAL_C} -I$S/dev/igb"
+	compile-with "${NORMAL_C} -I$S/dev/e1000"
 dev/e1000/e1000_ich8lan.c	optional em | igb \
 	compile-with "${NORMAL_C} -I$S/dev/e1000"
 dev/e1000/e1000_api.c		optional em | igb \
Index: sys/modules/netgraph/atm/ccatm/Makefile
===================================================================
--- sys/modules/netgraph/atm/ccatm/Makefile	(revision 218217)
+++ sys/modules/netgraph/atm/ccatm/Makefile	(working copy)
@@ -12,6 +12,6 @@
 SRCS=	ng_ccatm.c cc_conn.c cc_data.c cc_dump.c cc_port.c cc_sig.c	\
 	cc_user.c unisap.c
 
-CFLAGS+= -I${LIBBASE} -I${LIBBASE}/netnatm/ccatm -DCCATM_DEBUG
+CFLAGS+= -I${LIBBASE} -DCCATM_DEBUG
 
 .include <bsd.kmod.mk>