Added the headers to surrogate common.h