Some header changes to fix the build with other compilers.