Migrate to 2.6a4 header