UHT #includes generating the incorrect path for multiple modules per gamefeature

I upgraded from 5.5.4 to 5.6.1 and most was fine and a lot easier than going from 5.4 to 5.5, but there is one issue, that’s kinda annoying and I can’t find a solution for that.

I recycled some code from the CitySample and ended with a Gamefeature with CitySample and CitySampleAnimGraphRuntime:

“Modules”: [
{
“Name”: “CitySample”,
“Type”: “Runtime”,
“LoadingPhase”: “Default”
},
{
“Name”: “CitySampleAnimGraphRuntime”,
“Type”: “UncookedOnly”,
“LoadingPhase”: “Default”
}
],

It compiled fine in 5.5.x, but not in 5.6.1. I get an error, that my include paths in gen.cpp files for CitySampleAnimGraphRuntime are incorrect.

What I actually include in the header:

include “CitySample/Anim/CitySampleAnimNode_CopyPoseRotations.h”

What’s included in the generated cpp:

include “Anim/CitySampleAnimNode_CopyPoseRotations.h”

I manually added “CitySample/” to the wrong include paths, that way I can actually build, but that’s kinda annoying, because I have to do it for nearly every build.

I guess it’s related to one GameFeature including two modules, but since one of them is Uncooked I think it makes sense to have them together in one GameFeature.