Merge "Make headers C++11 compatible."