Index: libbsd_waf.py
===================================================================
--- libbsd_waf.py	(revision 54a577d44fc467221d6e7d831bd6f9c1d88849c5)
+++ libbsd_waf.py	(revision 5b1f20b73f410544f06353d4e81d5097c21ceac9)
@@ -973,50 +973,50 @@
               'rtemsbsd/rtems/ipsec_get_policylen.c',
               'rtemsbsd/rtems/rtems-bsd-arp-processor.c',
-              'rtemsbsd/rtems/rtems-bsd-assert.c',
-              'rtemsbsd/rtems/rtems-bsd-autoconf.c',
-              'rtemsbsd/rtems/rtems-bsd-bus-dma-mbuf.c',
-              'rtemsbsd/rtems/rtems-bsd-bus-dma.c',
-              'rtemsbsd/rtems/rtems-bsd-bus-root.c',
-              'rtemsbsd/rtems/rtems-bsd-cam.c',
-              'rtemsbsd/rtems/rtems-bsd-chunk.c',
-              'rtemsbsd/rtems/rtems-bsd-conf.c',
-              'rtemsbsd/rtems/rtems-bsd-configintrhook.c',
-              'rtemsbsd/rtems/rtems-bsd-delay.c',
               'rtemsbsd/rtems/rtems-bsd-get-allocator-domain-size.c',
               'rtemsbsd/rtems/rtems-bsd-get-ethernet-addr.c',
-              'rtemsbsd/rtems/rtems-bsd-get-file.c',
               'rtemsbsd/rtems/rtems-bsd-get-mac-address.c',
               'rtemsbsd/rtems/rtems-bsd-get-task-priority.c',
               'rtemsbsd/rtems/rtems-bsd-get-task-stack-size.c',
-              'rtemsbsd/rtems/rtems-bsd-init.c',
-              'rtemsbsd/rtems/rtems-bsd-irqs.c',
-              'rtemsbsd/rtems/rtems-bsd-jail.c',
-              'rtemsbsd/rtems/rtems-bsd-malloc.c',
-              'rtemsbsd/rtems/rtems-bsd-mbuf.c',
-              'rtemsbsd/rtems/rtems-bsd-mutex.c',
-              'rtemsbsd/rtems/rtems-bsd-muteximpl.c',
-              'rtemsbsd/rtems/rtems-bsd-newproc.c',
-              'rtemsbsd/rtems/rtems-bsd-nexus.c',
-              'rtemsbsd/rtems/rtems-bsd-page.c',
-              'rtemsbsd/rtems/rtems-bsd-panic.c',
-              'rtemsbsd/rtems/rtems-bsd-pci_bus.c',
-              'rtemsbsd/rtems/rtems-bsd-pci_cfgreg.c',
-              'rtemsbsd/rtems/rtems-bsd-program.c',
-              'rtemsbsd/rtems/rtems-bsd-rwlock.c',
               'rtemsbsd/rtems/rtems-bsd-shell-dhcpcd.c',
               'rtemsbsd/rtems/rtems-bsd-shell-netcmds.c',
               'rtemsbsd/rtems/rtems-bsd-shell.c',
-              'rtemsbsd/rtems/rtems-bsd-signal.c',
-              'rtemsbsd/rtems/rtems-bsd-sx.c',
               'rtemsbsd/rtems/rtems-bsd-syscall-api.c',
-              'rtemsbsd/rtems/rtems-bsd-sysctl.c',
-              'rtemsbsd/rtems/rtems-bsd-sysctlbyname.c',
-              'rtemsbsd/rtems/rtems-bsd-sysctlnametomib.c',
-              'rtemsbsd/rtems/rtems-bsd-thread.c',
-              'rtemsbsd/rtems/rtems-bsd-timesupport.c',
-              'rtemsbsd/rtems/rtems-bsd-vprintf.c',
-              'rtemsbsd/rtems/rtems-bsdnet-rtrequest.c',
+              'rtemsbsd/rtems/rtems-kernel-assert.c',
+              'rtemsbsd/rtems/rtems-kernel-autoconf.c',
+              'rtemsbsd/rtems/rtems-kernel-bus-dma-mbuf.c',
+              'rtemsbsd/rtems/rtems-kernel-bus-dma.c',
+              'rtemsbsd/rtems/rtems-kernel-bus-root.c',
+              'rtemsbsd/rtems/rtems-kernel-cam.c',
+              'rtemsbsd/rtems/rtems-kernel-chunk.c',
+              'rtemsbsd/rtems/rtems-kernel-conf.c',
+              'rtemsbsd/rtems/rtems-kernel-configintrhook.c',
+              'rtemsbsd/rtems/rtems-kernel-delay.c',
+              'rtemsbsd/rtems/rtems-kernel-get-file.c',
+              'rtemsbsd/rtems/rtems-kernel-init.c',
+              'rtemsbsd/rtems/rtems-kernel-irqs.c',
+              'rtemsbsd/rtems/rtems-kernel-jail.c',
+              'rtemsbsd/rtems/rtems-kernel-malloc.c',
+              'rtemsbsd/rtems/rtems-kernel-mbuf.c',
+              'rtemsbsd/rtems/rtems-kernel-mutex.c',
+              'rtemsbsd/rtems/rtems-kernel-muteximpl.c',
+              'rtemsbsd/rtems/rtems-kernel-nexus.c',
+              'rtemsbsd/rtems/rtems-kernel-page.c',
+              'rtemsbsd/rtems/rtems-kernel-panic.c',
+              'rtemsbsd/rtems/rtems-kernel-pci_bus.c',
+              'rtemsbsd/rtems/rtems-kernel-pci_cfgreg.c',
+              'rtemsbsd/rtems/rtems-kernel-program.c',
+              'rtemsbsd/rtems/rtems-kernel-rwlock.c',
+              'rtemsbsd/rtems/rtems-kernel-signal.c',
+              'rtemsbsd/rtems/rtems-kernel-sx.c',
+              'rtemsbsd/rtems/rtems-kernel-sysctl.c',
+              'rtemsbsd/rtems/rtems-kernel-sysctlbyname.c',
+              'rtemsbsd/rtems/rtems-kernel-sysctlnametomib.c',
+              'rtemsbsd/rtems/rtems-kernel-thread.c',
+              'rtemsbsd/rtems/rtems-kernel-timesupport.c',
+              'rtemsbsd/rtems/rtems-kernel-vprintf.c',
               'rtemsbsd/rtems/rtems-kvm.c',
-              'rtemsbsd/rtems/rtems_mii_ioctl_kern.c',
+              'rtemsbsd/rtems/rtems-legacy-mii.c',
+              'rtemsbsd/rtems/rtems-legacy-newproc.c',
+              'rtemsbsd/rtems/rtems-legacy-rtrequest.c',
               'rtemsbsd/rtems/syslog.c',
               'rtemsbsd/sys/dev/dw_mmc/dw_mmc.c',
