Fix headercheck by adding missing include.
Remove more unused typedefs.

They caused warnings with g++ 4.8.
Merge branch 'p/gruenich/fixes'

More fixes from Christoph, thanks!

* p/gruenich/fixes:
  Remove more unused typedefs.
  Fix headercheck by adding missing include.