Change include path to be more resilient