Fix missing headers
Fixes for the C++ compile