FS-6293: more srcdir build fixes
FS-6293: more srcdir build fixes
FS-6293: more srcdir build fixes, core builds now
FS-6293: more srcdir build fixes, fix mod_enum srcdir build