For functions that have the same signature but different names in 5.1 versus 5.2 a header file with #defines for that seems like a better idea to me than sprinkling #if/#else/#endif around each call site. -Etan