Improve header guards (again)