firm.h was missing timing.h (and maybe others) - convert it to a simpler style