double underscore. Added #includes for dependent files. * popt.c: Likewise. * popthelp.c: Likewise. * tree.c: Moved a macro from tree.h to here, as it is useless outside tree.c.