Changed order of a couple of functions in the header so they'll be easier to ignore in the c-api gen
c-code generation done, haven't actually tried to compile it yet..