Import relevant changes from diffHeaders.
Merge branch 'fixHeaders'

Conflicts:
	include/stdint.h