Added C++ include support
Changed include path for convenience
Fixed struct declaration