diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index beb14358e195..433d5f48f926 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.1295 2009/09/03 01:17:29 joerg Exp $
+#	$NetBSD: mi,v 1.1296 2009/09/03 12:04:50 pooka Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -635,6 +635,7 @@
 ./usr/include/fs/nilfs/nilfs_fs.h		comp-c-include
 ./usr/include/fs/nilfs/nilfs_mount.h		comp-c-include
 ./usr/include/fs/puffs/puffs_msgif.h		comp-puffs-include
+./usr/include/fs/smbfs/smbfs.h			comp-c-include
 ./usr/include/fs/sysvbfs/bfs.h			comp-c-include
 ./usr/include/fs/sysvbfs/sysvbfs_args.h		comp-c-include
 ./usr/include/fs/tmpfs/tmpfs_args.h		comp-c-include
@@ -1631,6 +1632,11 @@
 ./usr/include/netns/spp_debug.h			comp-obsolete		obsolete
 ./usr/include/netns/spp_timer.h			comp-obsolete		obsolete
 ./usr/include/netns/spp_var.h			comp-obsolete		obsolete
+./usr/include/netsmb/iconv.h			comp-c-include
+./usr/include/netsmb/netbios.h			comp-c-include
+./usr/include/netsmb/smb.h			comp-c-include
+./usr/include/netsmb/smb_conn.h			comp-c-include
+./usr/include/netsmb/smb_dev.h			comp-c-include
 ./usr/include/netpgp.h				comp-c-include		crypto
 ./usr/include/nfs/krpc.h			comp-c-include
 ./usr/include/nfs/nfs.h				comp-c-include
diff --git a/sbin/mount_smbfs/Makefile b/sbin/mount_smbfs/Makefile
index da1ca938c627..b133ae5f60e2 100644
--- a/sbin/mount_smbfs/Makefile
+++ b/sbin/mount_smbfs/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2009/04/11 07:58:12 lukem Exp $
+#	$NetBSD: Makefile,v 1.7 2009/09/03 12:04:50 pooka Exp $
 
 WARNS?=	3	# XXX: sign-compare issues
 
@@ -12,7 +12,7 @@ MAN=	mount_smbfs.8
 
 SMBDIST=${NETBSDSRCDIR}/dist/smbfs
 
-CPPFLAGS+= -I${NETBSDSRCDIR}/sys -I${SMBDIST}/include
+CPPFLAGS+= -I${SMBDIST}/include
 
 .PATH:	${SMBDIST}/mount_smbfs ${SMBDIST}/lib/smb
 
diff --git a/sys/fs/smbfs/Makefile b/sys/fs/smbfs/Makefile
index 7798eaf97dfa..d1e479c1e830 100644
--- a/sys/fs/smbfs/Makefile
+++ b/sys/fs/smbfs/Makefile
@@ -1,7 +1,7 @@
-#	$NetBSD: Makefile,v 1.2 2002/11/26 23:30:35 lukem Exp $
+#	$NetBSD: Makefile,v 1.3 2009/09/03 12:04:50 pooka Exp $
 
 INCSDIR= /usr/include/fs/smbfs
 
-#INCS=	smbfs.h smbfs_node.h smbfs_subr.h
+INCS=	smbfs.h
 
 .include <bsd.kinc.mk>
diff --git a/sys/netsmb/Makefile b/sys/netsmb/Makefile
index e2d7a8fc2258..91267018703d 100644
--- a/sys/netsmb/Makefile
+++ b/sys/netsmb/Makefile
@@ -1,8 +1,7 @@
-#	$NetBSD: Makefile,v 1.5 2002/11/26 23:30:34 lukem Exp $
+#	$NetBSD: Makefile,v 1.6 2009/09/03 12:04:50 pooka Exp $
 
 INCSDIR= /usr/include/netsmb
 
-#INCS=	iconv.h netbios.h smb.h smb_conn.h smb_dev.h smb_rq.h smb_subr.h \
-#	smb_tran.h smb_trantcp.h
+INCS=	iconv.h netbios.h smb.h smb_conn.h smb_dev.h
 
 .include <bsd.kinc.mk>