AW: Cleaning up include file inconsistencies

[Dr. Matthias St. Pierre]

FYI, I opened pull request #9333 on GitHub today, which demonstrates some of 
the ideas which I discussed in this thread.

https://github.com/openssl/openssl/pull/9333

Looking forward to your feedback.

Matthias