Fixing borked merge

Fixed missing includes

Typo

Typo (again)

Borked merge fix

Fixed refclock_generic.c, hopefully

Fixed typo

Had bunch of typos, fixed them across multiple commits, now squashing.