Common: Kill off duplicate log warning definitions

Also embed the log checks rather than using macros