Add missing includes

If I remember correctly, one of the missing includes lead to a compile error and the other one was found by test_headers.