Cleaned up a few unused includes and added missing ones.