WIXBUG:4474

Add missing headers; relocate headers to sdk\inc; add missing file and
correct typo to point to deputil directory.
Sorry, didn't indent when I undid the folder move.