Fix typo in include guard name
Removed unused local functions

Removed unused functions which clang was warning about.
Moved enum and typedef to public

Clang was issuing an error for a local functions which declared arguments were enums or typedefs declared private in test function. Moving the typedef and enum to public solve the problem.
Merge pull request #3696 from Dr15Jones/fixClangFoundProblems

Clang -- Fixed problems found by clang