added preprocessor macro to timer.h and updated tools.h