Make include files C++11 friendly