updated include files, no semantic changes
fix bugs in choice of default output device