fix includes in client library and lua bindings