diff --git a/sys/conf/files b/sys/conf/files
index 00ee9a60edc0..6e0c4382553c 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1,4 +1,4 @@
-#	$NetBSD: files,v 1.1119 2014/10/12 03:56:18 uebayasi Exp $
+#	$NetBSD: files,v 1.1120 2014/10/12 04:30:42 uebayasi Exp $
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
 
 version 	20141010
@@ -1471,234 +1471,7 @@ include "uvm/files.uvm"
 #
 include "secmodel/files.secmodel"
 
-#
-# kernel sources
-#
-define	kern:	machdep, uvm
-defflag	opt_kern.h			KERN
-file	compat/common/compat_mod.c	compat_netbsd | compat_netbsd32
-file	conf/debugsyms.c
-file	dev/bio.c			bio			needs-flag
-file	dev/ccd.c			ccd
-file	dev/cgd.c			cgd
-file	dev/cgd_crypto.c		cgd
-file	dev/clock_subr.c
-file	dev/clockctl.c			clockctl
-file	dev/dksubr.c			cgd | xbd | ccd | raid | dm
-file	dev/dkwedge/dk.c
-file	dev/dkwedge/dkwedge_apple.c	dkwedge_method_apple
-file	dev/dkwedge/dkwedge_bsdlabel.c	dkwedge_method_bsdlabel
-file	dev/dkwedge/dkwedge_gpt.c	dkwedge_method_gpt
-file	dev/dkwedge/dkwedge_mbr.c	dkwedge_method_mbr
-file	dev/firmload.c			firmload
-file	dev/fss.c			fss
-file	dev/keylock.c			keylock
-file	dev/lockstat.c			lockstat		needs-flag
-file	dev/md.c			md
-file	dev/mm.c
-file	dev/nullcons_subr.c		nullcons		needs-flag
-file	dev/radio.c			radio			needs-flag
-file	dev/rndpseudo.c			rnd			needs-flag
-file	dev/sequencer.c			sequencer		needs-flag
-file	dev/video.c			video			needs-flag
-file	dev/vnd.c			vnd
-file	kern/bufq_disksort.c		bufq_disksort
-file	kern/bufq_fcfs.c		bufq_fcfs
-file	kern/bufq_priocscan.c		bufq_priocscan
-file	kern/bufq_readprio.c		bufq_readprio | new_bufq_strategy
-file	kern/core_elf32.c		exec_elf32
-file	kern/core_elf64.c		exec_elf64
-file	kern/core_netbsd.c		exec_aout | exec_coff | exec_ecoff
-file	kern/cnmagic.c			kern
-file	kern/exec_aout.c		exec_aout
-file	kern/exec_ecoff.c		exec_ecoff
-file	kern/exec_elf32.c		exec_elf32
-file	kern/exec_elf64.c		exec_elf64
-file	kern/exec_script.c		exec_script
-file	kern/exec_subr.c		kern
-file	kern/init_main.c		kern
-file	kern/init_sysctl.c		kern
-file	kern/init_sysctl_base.c		kern
-file	kern/init_sysent.c		kern
-file	kern/kern_acct.c		kern
-file	kern/kern_auth.c		kern
-file	kern/kern_cfglock.c		kern
-file	kern/kern_clock.c		kern
-file	kern/kern_condvar.c		kern
-file	kern/kern_core.c		coredump
-file	kern/kern_cpu.c			kern
-file	kern/kern_ctf.c			kdtrace_hooks
-file	kern/kern_descrip.c		kern
-file	kern/kern_event.c		kern
-file	kern/kern_exec.c		kern
-file	kern/kern_exit.c		kern
-file	kern/kern_fork.c		kern
-file	kern/kern_idle.c		kern
-file	kern/kern_hook.c		kern
-file	kern/kern_kthread.c		kern
-file	kern/kern_ktrace.c		ktrace
-file	kern/kern_ktrace_vfs.c		ktrace
-file	kern/kern_ksyms.c		ksyms | ddb | modular needs-flag
-file	kern/kern_lock.c		kern
-file	kern/kern_lwp.c			kern
-file	kern/kern_malloc.c		kern
-file	kern/kern_module.c		kern
-file	kern/kern_module_vfs.c		kern
-file	kern/kern_mutex.c		kern
-file	kern/kern_mutex_obj.c		kern
-file	kern/kern_fileassoc.c		fileassoc
-file	kern/kern_ntptime.c		kern
-file	kern/kern_pax.c			pax_mprotect | pax_segvguard | pax_aslr
-file	kern/kern_physio.c		kern
-file	kern/kern_pmf.c			kern
-file	kern/kern_proc.c		kern
-file	kern/kern_prot.c		kern
-file	kern/kern_ras.c			kern
-file	kern/kern_rate.c		kern
-file	kern/kern_resource.c		kern
-file	kern/kern_rndpool.c		kern
-file	kern/kern_rndq.c		kern
-file	kern/kern_rndsink.c		kern
-file	kern/kern_runq.c		kern
-file	kern/kern_rwlock.c		kern
-file	kern/kern_rwlock_obj.c		kern
-file	kern/kern_sdt.c			kdtrace_hooks
-file	kern/kern_sig.c			kern
-file	kern/kern_sleepq.c		kern
-file	kern/kern_softint.c		kern
-file	kern/kern_ssp.c			kern
-file	kern/kern_stub.c		kern
-file	kern/kern_subr.c		kern
-file	kern/kern_synch.c		kern
-file	kern/kern_syscall.c		kern
-file	kern/kern_sysctl.c		kern
-file	kern/kern_tc.c			kern
-file	kern/kern_time.c		kern
-file	kern/kern_timeout.c		kern
-file	kern/kern_turnstile.c		kern
-file	kern/kern_todr.c		kern
-file	kern/kern_uidinfo.c		kern
-file	kern/kern_uuid.c		kern
-file	kern/kern_xxx.c			kern
-file	kern/kgdb_stub.c		kgdb
-file	kern/sched_4bsd.c		sched_4bsd
-file	kern/sched_m2.c			sched_m2
-file	kern/subr_autoconf.c		kern
-file	kern/subr_blist.c		vmswap
-file	kern/subr_bufq.c		kern
-file	kern/subr_callback.c		kern
-file	kern/subr_cprng.c		kern
-file	kern/subr_cpufreq.c		kern
-file	kern/subr_copy.c		kern
-file	kern/subr_debug.c		debug
-file	kern/subr_device.c		kern
-file	kern/subr_devsw.c		kern
-file	kern/subr_disk.c		kern
-file	kern/subr_disk_open.c		kern
-file	kern/subr_evcnt.c		kern
-file	kern/subr_exec_fd.c		kern
-file	kern/subr_extent.c		kern
-file	kern/subr_hash.c		kern
-file	kern/subr_humanize.c		kern
-file	kern/subr_iostat.c		kern
-file	kern/subr_ipi.c			kern
-file	kern/subr_kcpuset.c		kern
-file	kern/subr_kmem.c		kern
-file	kern/subr_kobj.c		kern
-file	kern/subr_kobj_vfs.c		kern
-file	kern/subr_lockdebug.c		kern
-file	kern/subr_log.c			kern
-file	kern/subr_lwp_specificdata.c	kern
-file	kern/subr_once.c		kern
-file	kern/subr_optstr.c		kern
-file	kern/subr_pcq.c			kern
-file	kern/subr_pcu.c			kern
-file	kern/subr_percpu.c		kern
-file	kern/subr_pool.c		kern
-file	kern/subr_prf.c			kern
-file	kern/subr_prof.c		kern
-file	kern/subr_pserialize.c		kern
-file	kern/subr_specificdata.c	kern
-file	kern/subr_tftproot.c		tftproot
-file	kern/subr_time.c		kern
-file	kern/subr_userconf.c		userconf
-file	kern/subr_vmem.c		kern
-file	kern/subr_workqueue.c		kern
-file	kern/subr_xcall.c		kern
-file	kern/sys_aio.c			aio
-file	kern/sys_descrip.c		kern
-file	kern/sys_generic.c		kern
-file	kern/sys_module.c		kern
-file	kern/sys_mqueue.c		mqueue
-file	kern/sys_lwp.c			kern
-file	kern/sys_pipe.c			!pipe_socketpair
-file	kern/sys_pmc.c			kern
-file	kern/sys_process.c		ptrace | ktrace
-file	kern/sys_pset.c			kern
-file	kern/sys_select.c		kern
-file	kern/sys_sig.c			kern
-file	kern/sys_sched.c		kern
-file	kern/sys_socket.c		kern
-file	kern/syscalls.c			syscall_debug
-file	kern/sysv_ipc.c			sysvshm | sysvsem | sysvmsg
-file	kern/sysv_msg.c			sysvmsg
-file	kern/sysv_sem.c			sysvsem
-file	kern/sysv_shm.c			sysvshm
-file	kern/tty.c			kern
-file	kern/tty_conf.c			kern
-file	kern/tty_bsdpty.c		compat_bsdpty
-file	kern/tty_pty.c			pty 			needs-flag
-file	kern/tty_ptm.c			pty
-file	kern/tty_subr.c			kern
-file	kern/tty_tty.c			kern
-file	kern/uipc_accf.c		kern
-file	kern/uipc_domain.c		kern
-file	kern/uipc_mbuf.c		kern
-file	kern/uipc_mbuf2.c		kern
-file	net/link_proto.c
-file	kern/uipc_proto.c		kern
-file	kern/uipc_sem.c			kern
-file	kern/uipc_socket.c		kern
-file	kern/uipc_socket2.c		kern
-file	kern/uipc_syscalls.c		kern
-file	kern/uipc_usrreq.c		kern
-
-define	vfs: kern
-file	kern/vfs_bio.c			vfs
-file	kern/vfs_cache.c		vfs
-file	kern/vfs_cwd.c			vfs
-file	kern/vfs_dirhash.c		vfs
-file	kern/vfs_getcwd.c		vfs
-file	kern/vfs_hooks.c		vfs
-file	kern/vfs_init.c			vfs
-file	kern/vfs_lockf.c		vfs
-file	kern/vfs_lookup.c		vfs
-file	kern/vfs_mount.c		vfs
-file	kern/vfs_quotactl.c		vfs
-file	kern/vfs_subr.c			vfs
-file	kern/vfs_syscalls.c		vfs
-file	kern/vfs_trans.c		vfs
-file	kern/vfs_vnode.c		vfs
-file	kern/vfs_vnops.c		vfs
-file	kern/vfs_wapbl.c		wapbl
-file	kern/vfs_xattr.c		vfs
-file	kern/vnode_if.c			vfs
-file	miscfs/deadfs/dead_vfsops.c	vfs
-file	miscfs/deadfs/dead_vnops.c	vfs
-file	miscfs/fifofs/fifo_vnops.c	vfs
-file	miscfs/genfs/genfs_io.c		vfs
-file	miscfs/genfs/genfs_rename.c	vfs
-file	miscfs/genfs/genfs_vfsops.c	vfs
-file	miscfs/genfs/genfs_vnops.c	vfs
-
-define	layerfs
-file	miscfs/genfs/layer_subr.c	layerfs
-file	miscfs/genfs/layer_vfsops.c	layerfs
-file	miscfs/genfs/layer_vnops.c	layerfs
-
-file	miscfs/specfs/spec_vnops.c	vfs
-file	miscfs/syncfs/sync_subr.c	vfs
-file	miscfs/syncfs/sync_vnops.c	vfs
+include "kern/files.kern"
 
 include "net/files.net"
 
diff --git a/sys/kern/files.kern b/sys/kern/files.kern
new file mode 100644
index 000000000000..b660e502d256
--- /dev/null
+++ b/sys/kern/files.kern
@@ -0,0 +1,230 @@
+#	$NetBSD: files.kern,v 1.1 2014/10/12 04:30:42 uebayasi Exp $
+
+#
+# kernel sources
+#
+define	kern:	machdep, uvm
+defflag	opt_kern.h			KERN
+file	compat/common/compat_mod.c	compat_netbsd | compat_netbsd32
+file	conf/debugsyms.c
+file	dev/bio.c			bio			needs-flag
+file	dev/ccd.c			ccd
+file	dev/cgd.c			cgd
+file	dev/cgd_crypto.c		cgd
+file	dev/clock_subr.c
+file	dev/clockctl.c			clockctl
+file	dev/dksubr.c			cgd | xbd | ccd | raid | dm
+file	dev/dkwedge/dk.c
+file	dev/dkwedge/dkwedge_apple.c	dkwedge_method_apple
+file	dev/dkwedge/dkwedge_bsdlabel.c	dkwedge_method_bsdlabel
+file	dev/dkwedge/dkwedge_gpt.c	dkwedge_method_gpt
+file	dev/dkwedge/dkwedge_mbr.c	dkwedge_method_mbr
+file	dev/firmload.c			firmload
+file	dev/fss.c			fss
+file	dev/keylock.c			keylock
+file	dev/lockstat.c			lockstat		needs-flag
+file	dev/md.c			md
+file	dev/mm.c
+file	dev/nullcons_subr.c		nullcons		needs-flag
+file	dev/radio.c			radio			needs-flag
+file	dev/rndpseudo.c			rnd			needs-flag
+file	dev/sequencer.c			sequencer		needs-flag
+file	dev/video.c			video			needs-flag
+file	dev/vnd.c			vnd
+file	kern/bufq_disksort.c		bufq_disksort
+file	kern/bufq_fcfs.c		bufq_fcfs
+file	kern/bufq_priocscan.c		bufq_priocscan
+file	kern/bufq_readprio.c		bufq_readprio | new_bufq_strategy
+file	kern/core_elf32.c		exec_elf32
+file	kern/core_elf64.c		exec_elf64
+file	kern/core_netbsd.c		exec_aout | exec_coff | exec_ecoff
+file	kern/cnmagic.c			kern
+file	kern/exec_aout.c		exec_aout
+file	kern/exec_ecoff.c		exec_ecoff
+file	kern/exec_elf32.c		exec_elf32
+file	kern/exec_elf64.c		exec_elf64
+file	kern/exec_script.c		exec_script
+file	kern/exec_subr.c		kern
+file	kern/init_main.c		kern
+file	kern/init_sysctl.c		kern
+file	kern/init_sysctl_base.c		kern
+file	kern/init_sysent.c		kern
+file	kern/kern_acct.c		kern
+file	kern/kern_auth.c		kern
+file	kern/kern_cfglock.c		kern
+file	kern/kern_clock.c		kern
+file	kern/kern_condvar.c		kern
+file	kern/kern_core.c		coredump
+file	kern/kern_cpu.c			kern
+file	kern/kern_ctf.c			kdtrace_hooks
+file	kern/kern_descrip.c		kern
+file	kern/kern_event.c		kern
+file	kern/kern_exec.c		kern
+file	kern/kern_exit.c		kern
+file	kern/kern_fork.c		kern
+file	kern/kern_idle.c		kern
+file	kern/kern_hook.c		kern
+file	kern/kern_kthread.c		kern
+file	kern/kern_ktrace.c		ktrace
+file	kern/kern_ktrace_vfs.c		ktrace
+file	kern/kern_ksyms.c		ksyms | ddb | modular needs-flag
+file	kern/kern_lock.c		kern
+file	kern/kern_lwp.c			kern
+file	kern/kern_malloc.c		kern
+file	kern/kern_module.c		kern
+file	kern/kern_module_vfs.c		kern
+file	kern/kern_mutex.c		kern
+file	kern/kern_mutex_obj.c		kern
+file	kern/kern_fileassoc.c		fileassoc
+file	kern/kern_ntptime.c		kern
+file	kern/kern_pax.c			pax_mprotect | pax_segvguard | pax_aslr
+file	kern/kern_physio.c		kern
+file	kern/kern_pmf.c			kern
+file	kern/kern_proc.c		kern
+file	kern/kern_prot.c		kern
+file	kern/kern_ras.c			kern
+file	kern/kern_rate.c		kern
+file	kern/kern_resource.c		kern
+file	kern/kern_rndpool.c		kern
+file	kern/kern_rndq.c		kern
+file	kern/kern_rndsink.c		kern
+file	kern/kern_runq.c		kern
+file	kern/kern_rwlock.c		kern
+file	kern/kern_rwlock_obj.c		kern
+file	kern/kern_sdt.c			kdtrace_hooks
+file	kern/kern_sig.c			kern
+file	kern/kern_sleepq.c		kern
+file	kern/kern_softint.c		kern
+file	kern/kern_ssp.c			kern
+file	kern/kern_stub.c		kern
+file	kern/kern_subr.c		kern
+file	kern/kern_synch.c		kern
+file	kern/kern_syscall.c		kern
+file	kern/kern_sysctl.c		kern
+file	kern/kern_tc.c			kern
+file	kern/kern_time.c		kern
+file	kern/kern_timeout.c		kern
+file	kern/kern_turnstile.c		kern
+file	kern/kern_todr.c		kern
+file	kern/kern_uidinfo.c		kern
+file	kern/kern_uuid.c		kern
+file	kern/kern_xxx.c			kern
+file	kern/kgdb_stub.c		kgdb
+file	kern/sched_4bsd.c		sched_4bsd
+file	kern/sched_m2.c			sched_m2
+file	kern/subr_autoconf.c		kern
+file	kern/subr_blist.c		vmswap
+file	kern/subr_bufq.c		kern
+file	kern/subr_callback.c		kern
+file	kern/subr_cprng.c		kern
+file	kern/subr_cpufreq.c		kern
+file	kern/subr_copy.c		kern
+file	kern/subr_debug.c		debug
+file	kern/subr_device.c		kern
+file	kern/subr_devsw.c		kern
+file	kern/subr_disk.c		kern
+file	kern/subr_disk_open.c		kern
+file	kern/subr_evcnt.c		kern
+file	kern/subr_exec_fd.c		kern
+file	kern/subr_extent.c		kern
+file	kern/subr_hash.c		kern
+file	kern/subr_humanize.c		kern
+file	kern/subr_iostat.c		kern
+file	kern/subr_ipi.c			kern
+file	kern/subr_kcpuset.c		kern
+file	kern/subr_kmem.c		kern
+file	kern/subr_kobj.c		kern
+file	kern/subr_kobj_vfs.c		kern
+file	kern/subr_lockdebug.c		kern
+file	kern/subr_log.c			kern
+file	kern/subr_lwp_specificdata.c	kern
+file	kern/subr_once.c		kern
+file	kern/subr_optstr.c		kern
+file	kern/subr_pcq.c			kern
+file	kern/subr_pcu.c			kern
+file	kern/subr_percpu.c		kern
+file	kern/subr_pool.c		kern
+file	kern/subr_prf.c			kern
+file	kern/subr_prof.c		kern
+file	kern/subr_pserialize.c		kern
+file	kern/subr_specificdata.c	kern
+file	kern/subr_tftproot.c		tftproot
+file	kern/subr_time.c		kern
+file	kern/subr_userconf.c		userconf
+file	kern/subr_vmem.c		kern
+file	kern/subr_workqueue.c		kern
+file	kern/subr_xcall.c		kern
+file	kern/sys_aio.c			aio
+file	kern/sys_descrip.c		kern
+file	kern/sys_generic.c		kern
+file	kern/sys_module.c		kern
+file	kern/sys_mqueue.c		mqueue
+file	kern/sys_lwp.c			kern
+file	kern/sys_pipe.c			!pipe_socketpair
+file	kern/sys_pmc.c			kern
+file	kern/sys_process.c		ptrace | ktrace
+file	kern/sys_pset.c			kern
+file	kern/sys_select.c		kern
+file	kern/sys_sig.c			kern
+file	kern/sys_sched.c		kern
+file	kern/sys_socket.c		kern
+file	kern/syscalls.c			syscall_debug
+file	kern/sysv_ipc.c			sysvshm | sysvsem | sysvmsg
+file	kern/sysv_msg.c			sysvmsg
+file	kern/sysv_sem.c			sysvsem
+file	kern/sysv_shm.c			sysvshm
+file	kern/tty.c			kern
+file	kern/tty_conf.c			kern
+file	kern/tty_bsdpty.c		compat_bsdpty
+file	kern/tty_pty.c			pty 			needs-flag
+file	kern/tty_ptm.c			pty
+file	kern/tty_subr.c			kern
+file	kern/tty_tty.c			kern
+file	kern/uipc_accf.c		kern
+file	kern/uipc_domain.c		kern
+file	kern/uipc_mbuf.c		kern
+file	kern/uipc_mbuf2.c		kern
+file	net/link_proto.c
+file	kern/uipc_proto.c		kern
+file	kern/uipc_sem.c			kern
+file	kern/uipc_socket.c		kern
+file	kern/uipc_socket2.c		kern
+file	kern/uipc_syscalls.c		kern
+file	kern/uipc_usrreq.c		kern
+
+define	vfs: kern
+file	kern/vfs_bio.c			vfs
+file	kern/vfs_cache.c		vfs
+file	kern/vfs_cwd.c			vfs
+file	kern/vfs_dirhash.c		vfs
+file	kern/vfs_getcwd.c		vfs
+file	kern/vfs_hooks.c		vfs
+file	kern/vfs_init.c			vfs
+file	kern/vfs_lockf.c		vfs
+file	kern/vfs_lookup.c		vfs
+file	kern/vfs_mount.c		vfs
+file	kern/vfs_quotactl.c		vfs
+file	kern/vfs_subr.c			vfs
+file	kern/vfs_syscalls.c		vfs
+file	kern/vfs_trans.c		vfs
+file	kern/vfs_vnode.c		vfs
+file	kern/vfs_vnops.c		vfs
+file	kern/vfs_wapbl.c		wapbl
+file	kern/vfs_xattr.c		vfs
+file	kern/vnode_if.c			vfs
+file	miscfs/deadfs/dead_vfsops.c	vfs
+file	miscfs/deadfs/dead_vnops.c	vfs
+file	miscfs/fifofs/fifo_vnops.c	vfs
+file	miscfs/genfs/genfs_io.c		vfs
+file	miscfs/genfs/genfs_rename.c	vfs
+file	miscfs/genfs/genfs_vfsops.c	vfs
+file	miscfs/genfs/genfs_vnops.c	vfs
+
+define	layerfs
+file	miscfs/genfs/layer_subr.c	layerfs
+file	miscfs/genfs/layer_vfsops.c	layerfs
+file	miscfs/genfs/layer_vnops.c	layerfs
+
+file	miscfs/specfs/spec_vnops.c	vfs
+file	miscfs/syncfs/sync_subr.c	vfs
+file	miscfs/syncfs/sync_vnops.c	vfs