Fix missing headers that clang complains about