i386/macOS support: include fixup header where needed

8 jobs for !482 with fix-i386-macOS-build in 3 minutes and 59 seconds (queued for 9 seconds)
latest merge request