I would prefer separate commit for include guard fix. SKIP_UNITY_BUILD_INCLUSION sounds like workaround. Can it be fixed so this is not needed? -- https://code.launchpad.net/~mitya57/compiz/+git/compiz/+merge/388842 Your team Compiz Maintainers is subscribed to branch compiz:master.