moved the same macro that had been defined in some files to a header file.