pull handle definitions and typedefs into their own header