futher include and linkpath modifications