opentxs:: include fixes