Add more missing header includes