Added some missing includes