Add (now) needed includes

Authored by kossebau on Mar 23 2017, 2:04 AM.