api: Get make check to compile

We now can successfully build everything, make check is failing however and
will need to be fixed before rebasing.