Use the new factored-out include code to do proper include path