Some of the include paths don't work. Not sure whether my patch is a correct fix or merely an awkward way to work around a problem that's somewhere else.
