Build fixes for missing header files.