Merge "Remove unnecessary header file."