Re-added 3 header files back to the public interface.