eliminating compiler errors caused by using user-defined type names as identifiers, and missing includes
Merge pull request #8 from grubino/master

eliminating compiler errors