Issue #442: Remove or declare undefined variables in common.inc.
Merge pull request #571 from quicksketch/442/undefined_variables

Issue #442: Declare undefined variables in common.inc.