2.2 compile OMR fails, apparently from lack of definitions for 'ClefType', 'DPI', 'quartheadSym'

Just happened to build 2.2 with OMR on, and got errors (of course I can still compile MuseScore with OMR off):

/var/MuseScore/omr/omrpage.h:66: error: ‘ClefType’ does not name a type; did you mean ‘BeatType’?
ClefType type = CLEF_G;
^~~~~~~~
BeatType

/var/MuseScore/omr/omrview.cpp:75: error: ‘DPI’ is not a member of ‘Ms::MScore’
pageWidth = lrint(pf->width() * mag * MScore::DPI);
^~~

/var/MuseScore/omr/omrview.cpp:160: error: ‘DPI’ is not a member of ‘Ms::MScore’
int h = lrint(pf->height() * mag * MScore::DPI);
^~~

/var/MuseScore/omr/omrview.cpp:240: error: ‘quartheadSym’ was not declared in this scope
if (n->sym == quartheadSym)
^~~~~~~~~~~~

/var/MuseScore/omr/omrpage.h:66: error: ‘CLEF_G’ was not declared in this scope
ClefType type = CLEF_G;
^~~~~~