- removed error prone macros, fixes bug #10151 (build fails dynamic linking on Mac...