Merge "Fix log debugging includes"