First error has been fixed upstream with this commit: https://github.com/EpicGames/UnrealEngine/commit/efab9121048a8d9518204738f8d8a8baf0965dd6
Your solution adding the include is more elegant though…
About the infinity, these commits solved it:
https://github.com/EpicGames/UnrealEngine/commit/22f81416243a9bfb89e132cea66c288596006d47
and
EpicGames/UnrealEngine/commit/9ce28ae0cb3e5c4a8bd513b37f4dd3c680617a83
(not a url link because I’m a new user and seems there’s a limit of 2 :D)
Cheers