Revert "#121: missing includes"

This reverts commit 8a507f165d33d3b517081d5e7b34ca60704e43a3.