Migrate to 2.6 header