Can we move the includes into "/includes"? I think the c bindings implementation is still okay to have where it is.