Use umbrella instead of a direct include in timing module

Use umbrella instead of a direct include in timing module #689