A few more missing includes