Patches for plugins/common.h sanity fixes [sf#1211973] [#476]