Allows the API to be used in multiple files on the same binary (more fixes)