Grab corrected headers from master

Signed-off-by: Jody Garnett <jody.garnett@gmail.com>