overhaul internally-public declarations using wrapper headers