Two patches for typegen on master

Two necessary fixes to make a typegen generated package build. I'm not sure of the 'include string header always', maybe the bug is in the generation of the to/from CORBA functions itself.. so please review.