Removed extern C definition's, ill hang on plugin system tomorrow (off, lul)