Change the header file organization. Extract the public interface.