Improved code inclusion macro guard