Add missing file
Tweak configure
Continue de-C++11ing code
Rearrange headers to load C++ code at more sensible place
Switch compiler flag
Update configure test
Add missing header
Merge from master