WIXBUG:4474

Add missing headers; relocate headers to sdk\inc; add missing file and
correct typo to point to deputil directory.
I don't follow what's happening here. Is this just a spacing change? If so, it doesn't quite look right...