Add missing header files, builds without errors now