Added option to add count entry to enumeration.
Corrected commas in header files.