Fixed up some issues with missing includes which prevented compilation.