Has anyone else noticed the lack of wdc.h and fdc.h preventing
   kernel compiles with the -current sources?

1) Put the `delete' option in your supfile.

2) Use `config.new', not `config', and update your config file
accordingly.  (There are plenty of examples.  I don't feel I need to
describe it here.)