add a few missing includes

these includes are required by the headers. If the affected files
would have been included without the headers included before, a
compiler error would have been produced.
Merge pull request #290 from andlaus/add_includes

add a few missing includes