Added some missing includes.
Added a missing header.