add more missing includes