Update for location of newnfs headers, clean up some other #include
branches: 1.1.1;Initial revision