Add include directories more carefully
Improve typemap behaviors