added filtering of /usr/include paths to avoid system libraries; fixed incorrect emission of 'self' twice in c->c++ shim call