Added tox_ to 2 typedefs.