Merge "Avoid mixing declarations and statements in C89 source files"