Fixed generated headers for use with C compilers ...