Making changes to some #includes to get things to compile.