Changed header files to avoid error with c++11 compilers