Adding some missing includes