[PATCH v2 12/30] logging: Remove unused includes