Add missing headers for newer compilers