Fixes and .... in FILEs rpdef/c.c rpdef/c.h