* Remove a few trailing whitespaces * Rearrange and join to one #if for some headers Patch contributed by Slava Semushin <slava.semushin@gmail.com> in private mail.
