moved UNI macros to separate header file