changed order of include statements in common.c