Make inclusion guards consistent