Sort headers, move includes up to the top of the file, function return types on their own line; no functional change.