diff --git a/plugin/gd/gvrender_gd.c b/plugin/gd/gvrender_gd.c
index 960271c..2494e95 100644
--- a/plugin/gd/gvrender_gd.c
+++ b/plugin/gd/gvrender_gd.c
@@ -259,7 +259,7 @@ static void gdgen_missingfont(char *fontreq) {
 #else
 #define GD_IMPORT
 #endif
-GD_IMPORT extern gdFontPtr gdFontTiny, gdFontSmall, gdFontMediumBold, gdFontLarge, gdFontGiant;
+BGD_EXPORT_DATA_PROT extern gdFontPtr gdFontTiny, gdFontSmall, gdFontMediumBold, gdFontLarge, gdFontGiant;
 
 void gdgen_text(gdImagePtr im, pointf spf, pointf epf, int fontcolor, double fontsize, int fontdpi, double fontangle, char *fontname, char *str)
 {
diff --git a/plugin/pango/CMakeLists.txt b/plugin/pango/CMakeLists.txt
index 26749af..65d77e4 100644
--- a/plugin/pango/CMakeLists.txt
+++ b/plugin/pango/CMakeLists.txt
@@ -58,6 +58,7 @@ if(CAIRO_FOUND AND PANGOCAIRO_FOUND)
   set_target_properties(gvplugin_pango PROPERTIES
     VERSION ${GRAPHVIZ_PLUGIN_VERSION}.0.0
     SOVERSION ${GRAPHVIZ_PLUGIN_VERSION}
+    LINKER_LANGUAGE CXX # for cairo
   )
 
   if(MINGW)