Fix header imports for logging macros