WIXBUG:4474

Add missing headers; relocate headers to sdk\inc; add missing file and
correct typo to point to deputil directory.
Undo inc directory move
Fix whitespace
Merge pull request #115 from barnson/bug4474

Conflicts:
	History.md