8208199: Revisit one interface per header file approach