Fixes to get compiling to work. This is mainly fixing up some includes; changing...