Merge "Move stuff only needed by pthread-timers.c into pthread-timers.c."