Fixing up some compile errors from things we don't need to include.