Add missing includes

This fixes the compile breaks in the regression tests.