Fix error handling for file includes.
Cosmetic changes to include search path