9a4718ff73
amalgamation, since some compilers become upset over duplicate typedefs. FossilOrigin-Name: de28acd42f29693341feb884b7223cd3d2b96730