Consolidate C++14 compatibility into new headers