Merge "Fix header file dependencies."