Problem compiling FVSVOVM Xbar package

Hi,

I'm trying to use irun to compile the Xbar package that accompanies the book Step-by-Step Functional Verification with SystemVerilog and OVM.  I get the following error, and I don't know what the real problem is.  The file testbench.sv includes testbench.svh, which then simply includes ovm.svh.

Has anyone encountered this and know how to resolve it?  Thanks for your help in advance.

======

file: sv/testbench.sv
typedef class ovm_test_done;
                          |
ncvlog: *E,TYDMSC (./INCA_libs/irun.lnx86.09.20.nc/svpplib/specials/ovm_object_registry_ovm_test_done_objection_ovm_test_done.svi,17|26): The class specified in the typedef was never declared.
ovm_test_done_objection ovm_test_done = ovm_test_done_objection::get();
                                    |
ncvlog: *E,DUPIDN (/home/eng/peterlu/ovm-2.1/src/base/ovm_globals.svh,51|36): identifier 'ovm_test_done' previously declared [12.5(IEEE)].
        module worklib.xbar_test_launcher:sv
                errors: 2, warnings: 0
irun: *E,VLGERR: An error occurred during parsing.  Review the log file for errors with the code *E and fix those identified problems to proceed.  Exiting with code (status 1).