rebuilt bindings to include #defines.