Fixed order of includes in common.h causing compile errors on linux