Removed constants from legacy C api and switched out header with shorter version.

Removed blank line that was failing CI.