diff3's getopt.h included a function declaration without a prototype,
which produces a warning.  Just remove the bespoke getopt.h and use
the system's one.