Tweak configure
Continue de-C++11ing code
Rearrange headers to load C++ code at more sensible place