Device Support: Add more missing headers, c files and fix conflicts with the HTC code that was ported forwards.