Adapted to geant4-10-00-patch-01, mainly adding the include files for units