[FIX] fixed macro positioning
[FIX] fixed remaining attribute warnings by moving the macros to the correct location