Move log enabling decision to the log handler, not to the macro.
Remove useless Logger includes sprinkled all over the place.