Remove import of CommonMacros.h