Merge "Update legacy headers in the new directory." into main