@xoascf what happens when running ExtractAssets with these changes? My assumption is it leads to a giant git diff.

if we want to change these files we'll need to change ExtractAssets to generate them differently

@xoascf this is where this is generated:
https://github.com/HarbourMasters/Shipwright/blob/develop/ZAPDTR/ZAPD/ZResource.cpp#L354
and
https://github.com/HarbourMasters/Shipwright/blob/develop/ZAPDTR/ZAPD/ZResource.cpp#L374

you should be able to make your changes there to generate the simplified headers

@xoascf could you please do one more rebase before I merge this? I'm not sure if we have the latest headers (at some point we added also the MQ headers).

@xoascf could you please do one more rebase before I merge this? I'm not sure if we have the latest headers (at some point we added also the MQ headers).

Yes, shortly after that update, the headers were updated again for this PR, there should be no conflicts, but I will rebase again to make sure.

Update: There have been no changes after rerunning the ExtractAssets target for MQ.

Thanks for this @xoascf !