Extract a TimerWrapper interface from the CurrentDateWrapper
add some missing headers