Changed "format" in the headers to support GNU m4 extensions.