Clean up in header inclusions.
First stage of C++11 implementing.

Not working yet