15be948d79
There were a few places where *_EXTRA_INCLUDES (and derivates) were still being used. This commit removes all of them.