Update headers to 3.7-pre-rc

Get latest headers from merge
4 files changed