Remove Arch droppings.
Include getopt*.[ch] rather than scrabbling around for them.