removing #ifndef guards around range check