Reordered the includes in alphabetical order.

Also split up c++ and c includes.
Also eliminated trailing whitespace.