Cbuildtest

this is not intended to be merged (it consists of 2 separate fixes in 2 different pull requests).
it is merely for me to see if the automated build now detects the C header as C.