Added some missing includes'