Merge "Factor out common include directories into helper"