Changes needed after ef736a1c39 that removes some implicit dependencies from MrCV headers.
ef736a1c39