diff --git a/plugins/Makefile b/plugins/Makefile
index 8191cd47..ba4e01ab 100644
--- a/plugins/Makefile
+++ b/plugins/Makefile
@@ -233,7 +233,7 @@ $(BULLET_LIB): $(OUT_DIR)/../bullet3-$(BULLET_VER).tar.gz
 
 
 $(PLUG_PREFIX)bullet$(PLUG_NATIVE_EXT): bullet/bulletplug.cpp plugin.c $(BULLET_LIBS)
-	$(CXX) $(BASE_CFLAGS) $(CFLAGS) -DFTEPLUGIN -o $@ -shared $(PLUG_CFLAGS) $^ $(PLUG_DEFFILE) $(PLUG_LDFLAGS) $(BULLET_CFLAGS)
+	$(CXX) $(BASE_CXXFLAGS) $(CFLAGS) -DFTEPLUGIN -o $@ -shared $(PLUG_CFLAGS) $^ $(PLUG_DEFFILE) $(PLUG_LDFLAGS) $(BULLET_CFLAGS)
 #NATIVE_PLUGINS+=bullet
 
 
diff --git a/plugins/plugin.c b/plugins/plugin.c
index c6fc6c30..70f79a57 100644
--- a/plugins/plugin.c
+++ b/plugins/plugin.c
@@ -226,11 +226,14 @@ void Sys_Errorf(const char *format, ...)
 	plugfuncs->Error(string);
 }
 
+#ifdef __cplusplus
+extern "C"
+#endif
 qboolean NATIVEEXPORT FTEPlug_Init(plugcorefuncs_t *corefuncs)
 {
 	plugfuncs = corefuncs;
-	cmdfuncs = plugfuncs->GetEngineInterface(plugcmdfuncs_name, sizeof(*cmdfuncs));
-	cvarfuncs = plugfuncs->GetEngineInterface(plugcvarfuncs_name, sizeof(*cvarfuncs));
+	cmdfuncs = (plugcmdfuncs_t*)plugfuncs->GetEngineInterface(plugcmdfuncs_name, sizeof(*cmdfuncs));
+	cvarfuncs = (plugcvarfuncs_t*)plugfuncs->GetEngineInterface(plugcvarfuncs_name, sizeof(*cvarfuncs));
 
 	return Plug_Init();
 }