Fixed typo in C++ ifdef directives in some files

-cppcheck identified some typos in #ifdef __cplusplus checks. Those have
been fixed.
-HID improvements.