missing types (renamed etc)

Hi, I was able to adjust code with a few typedefs and some missing headers to make it compile. I suspect you might have some more recent version locally. Would you mind commiting your own later changes, if you have some and are willing to share, so that I don't fix something which you fixed already? I would look very much forward to a an updated version of the code. Thanks for consideration!