Corrected constant name
Added inhibit #ifndefs for internal code
Adjusted type names with trailing '_t'