moved commonly used macros to a newly created header file: DBClientUtils.h.