Why are include files checked in?  They come from the build system.
Merge remote-tracking branch 'upstream/master'