changed builtin_*.defs.hh style