Reorganize dyno/d2 headers.