diff -ud lib/libbsnmp/modules/snmp_mibII/Makefile.org lib/libbsnmp/modules/snmp_mibII/Makefile
--- lib/libbsnmp/modules/snmp_mibII/Makefile.org	Mon Nov 10 10:17:33 2003
+++ lib/libbsnmp/modules/snmp_mibII/Makefile	Mon Nov 10 14:29:31 2003
@@ -4,6 +4,8 @@
 
 CONTRIB=${.CURDIR}/../../../../contrib/bsnmp/snmp_mibII
 .PATH: ${CONTRIB}
+SNMPLIB=${.CURDIR}/../../../../contrib/bsnmp/lib
+SNMPMOD=${.CURDIR}/../../../../contrib/bsnmp/snmpd
 
 MOD=	mibII
 SRCS=	mibII.c mibII_ifmib.c mibII_ip.c mibII_interfaces.c		\
@@ -14,6 +16,6 @@
 DEFS=	${MOD}_tree.def
 INCS=	snmp_${MOD}.h
 
-CFLAGS+= -I${INCLUDEDIR}/bsnmp -I${.CURDIR}
+CFLAGS+= -I${SNMPLIB} -I${SNMPMOD} -I${CONTRIB} -I${.CURDIR}
 
 .include <bsd.lib.mk>
diff -ud lib/libbsnmp/modules/snmp_netgraph/Makefile.org lib/libbsnmp/modules/snmp_netgraph/Makefile
--- lib/libbsnmp/modules/snmp_netgraph/Makefile.org	Mon Nov 10 10:17:34 2003
+++ lib/libbsnmp/modules/snmp_netgraph/Makefile	Mon Nov 10 14:33:09 2003
@@ -2,6 +2,10 @@
 #
 # Author: Harti Brandt <harti@freebsd.org>
 
+SNMPLIB=${.CURDIR}/../../../../contrib/bsnmp/lib
+SNMPMIB=${.CURDIR}/../../../../contrib/bsnmp/snmp_mibII
+SNMPMOD=${.CURDIR}/../../../../contrib/bsnmp/snmpd
+
 MOD=	netgraph
 SRCS=	snmp_netgraph.c
 MAN=	snmp_netgraph.3
@@ -10,6 +14,6 @@
 DEFS=	${MOD}_tree.def
 INCS=	snmp_${MOD}.h
 
-CFLAGS+= -I${INCLUDEDIR}/bsnmp -I${.CURDIR}
+CFLAGS+= -I${SNMPLIB} -I${SNMPMIB} -I${SNMPMOD} -I${.CURDIR}
 
 .include <bsd.lib.mk>