A few more tweaks to get correct WINDDK compilation.