Made some more changes to the include statements, to get rid of hard coded path names.