Remove unecessary macro & move one in header file