Better handling of paths to include files