Added missing includes and defintions