I've just included the original definitions into this file. You may want to move that part to somewhere else.