adding include fixup

maybe the first practical one.
found the throw case

hit in test_005.cc in line 8, the second time we see std::string.

Removing the insert and just continuing seems the right thing to do. All
tests pass now.
Adding XEntity  (wip)

Instead of having a fat XternDef