Improve include guard