Add a couple of typedefs