Although I still have no idea why the FTBFS did not occur before, even though the includes were missing in the generated C++ source files, attached patch will fix this problem.
Merged and pushed upstream. Looks good.
No due date set.
This pull request currently doesn't have any dependencies.
Deleting a branch is permanent. It CANNOT be undone. Continue?