3 files changed, 12 insertions, 7 deletions
diff --git a/libs/gtkmm2ext/gtkapplication_x11.c b/libs/gtkmm2ext/gtkapplication_x11.c
index 78d538b334..2b85677073 100644
--- a/libs/gtkmm2ext/gtkapplication_x11.c
+++ b/libs/gtkmm2ext/gtkapplication_x11.c
@@ -36,11 +36,14 @@ void gtk_application_cleanup (void)
 void                      
 gtk_application_set_menu_bar (GtkMenuShell* menushell)
 {
+	(void) menushell;
 }
 
 void                      
 gtk_application_add_app_menu_item (GtkApplicationMenuGroup* group, GtkMenuItem* item)
 {
+	(void) group;
+	(void) item;
 }
 
 void
diff --git a/libs/gtkmm2ext/gtkmm2ext/utils.h b/libs/gtkmm2ext/gtkmm2ext/utils.h
index e0c4dcdb2d..c672afd75c 100644
--- a/libs/gtkmm2ext/gtkmm2ext/utils.h
+++ b/libs/gtkmm2ext/gtkmm2ext/utils.h
@@ -24,13 +24,13 @@
 #include <string>
 #include <stdint.h>
 
-#include <cairomm/refptr.h>
+#include <cairomm/cairomm.h>
+#include <pangomm/fontdescription.h>
 
 #include <gtkmm/container.h>
 #include <gtkmm/treeview.h>
 #include <gdkmm/window.h> /* for WMDecoration */
 #include <gdkmm/pixbuf.h>
-#include <pangomm/fontdescription.h>
 
 #include "gtkmm2ext/visibility.h"
 
@@ -120,6 +120,8 @@ namespace Gtkmm2ext {
 	LIBGTKMM2EXT_API void set_no_tooltip_whatsoever (Gtk::Widget &);
 	LIBGTKMM2EXT_API void enable_tooltips ();
 	LIBGTKMM2EXT_API void disable_tooltips ();
+
+	LIBGTKMM2EXT_API void convert_bgra_to_rgba (guint8 const *, guint8 * dst, int, int);
 };
 
 #endif /*  __gtkmm2ext_utils_h__ */
diff --git a/libs/gtkmm2ext/utils.cc b/libs/gtkmm2ext/utils.cc
index f0a09d5685..a11b431ef0 100644
--- a/libs/gtkmm2ext/utils.cc
+++ b/libs/gtkmm2ext/utils.cc
@@ -129,11 +129,11 @@ demultiply_alpha (guint8 src,
 	return alpha ? ((guint (src) << 8) - src) / alpha : 0;
 }
 
-static void
-convert_bgra_to_rgba (guint8 const* src,
-		      guint8*       dst,
-		      int           width,
-		      int           height)
+void
+Gtkmm2ext::convert_bgra_to_rgba (guint8 const* src,
+				 guint8*       dst,
+				 int           width,
+				 int           height)
 {
 	guint8 const* src_pixel = src;
 	guint8*       dst_pixel = dst;