Merge "Fix error in generated header files"