Better layout of the generated .hrl files
Fix generated function for relation 'has'