Updating dev dependencies and Make include path to fix CI tests