Adding header includes and little stuff for compilers that aren't clang, I guess.