Moved headers around so we include <devices/timer.h> before <sys/time.h> (so we don't have to patch the OS headers)