PJ: clean up fli.h and friends.
PJ: clean up fontdev.h.