Renamed header guards to avoid name collision