fixes/improves include path file resolution