Minor: make header defines consistent