r4531: Include the OID locally, as it seems to be hard to get the includes