[Merge] compiz:build-fixes into compiz:master

[Alberts Muktupāvels]

The proposal to merge compiz:build-fixes into compiz:master has been updated.

Commit message changed to:

Fix build errors and warnings

For more details, see:
https://code.launchpad.net/~compiz-team/compiz/+git/compiz/+merge/428314
-- 
Your team Compiz Maintainers is requested to review the proposed merge of compiz:build-fixes into compiz:master.