fix some type leakage (timer_t) from x86_64 commit