[ok][prev] the needed changes in common.h