Add missing includes

This fixes the compile breaks in the regression tests.
Merge pull request #7 from MarcelRaad/develop

Add missing includes