Merge pull request #337 from belkiss/development Modify struct definition to enable forward declare with C++ compiler, thus avoid including C library's header in C++ header.