Merge "Header file clean up."