Remove some unused header defines