Do not include the common class as not required
Merge branch 'remove_common_include'