* Do something more GCC like to catch problems in included
   files.
 * Small coding style fixes.
 * Handle the few warnings the compiler does generate
 * Fix cut and paste error and return the correct name when asked

Reviewed-By: con