Merge "Hiding struct diff in *.c file."