--- ./cmake/Modules/GObjectIntrospection.cmake.orig	2015-02-22 23:39:10.000000000 +0100
+++ ./cmake/Modules/GObjectIntrospection.cmake	2015-05-10 19:44:47.568256600 +0200
@@ -181,7 +181,7 @@
 	set(ENV{CFLAGS} ${GIR_REAL_CFLAGS})
 	add_custom_command(
 		OUTPUT ${GIR_FILENAME}
-		COMMAND ${GIR_SCANNER} ${GIR_SCANNER_ARGS}
+		COMMAND CC=${CMAKE_C_COMPILER} ${GIR_SCANNER} ${GIR_SCANNER_ARGS}
 			--namespace=${GIR_NAMESPACE}
 			--nsversion=${GIR_NSVERSION}
 			${GIR_REAL_CFLAGS}
--- ./gplugin/gplugin-manager.c.orig	2015-05-10 20:02:00.022359200 +0200
+++ ./gplugin/gplugin-manager.c	2015-05-10 20:02:12.100326200 +0200
@@ -1119,7 +1119,11 @@
 gplugin_manager_add_default_paths(void) {
 	gchar *path;
 
-	path = g_build_filename(PREFIX, LIBDIR, "gplugin", NULL);
+	gchar *dir;
+
+	dir = g_win32_get_package_installation_directory_of_module (NULL);
+	path = g_build_filename(dir, "lib", "gplugin", NULL);
+	g_free (dir);
 	gplugin_manager_prepend_path(path);
 	g_free(path);
 
@@ -1146,7 +1146,11 @@
 
 	g_return_if_fail(appname != NULL);
 
-	path = g_build_filename(prefix, LIBDIR, appname, NULL);
+	gchar *dir;
+
+	dir = g_win32_get_package_installation_directory_of_module (NULL);
+	path = g_build_filename(dir, "lib", appname, NULL);
+	g_free (dir);
 	gplugin_manager_prepend_path(path);
 	g_free(path);
 
--- ./gplugin-gtk/gplugin-gtk-plugin-info.c.orig	2015-05-10 20:00:56.780137100 +0200
+++ ./gplugin-gtk/gplugin-gtk-plugin-info.c	2015-05-10 20:01:16.721412000 +0200
@@ -239,8 +239,13 @@
 
 	/* load the ui from the GtkBuilder file */
 	priv->builder = gtk_builder_new();
-	filename = g_build_filename(PREFIX, "share", "gplugin", "gplugin-gtk",
+
+	gchar *dir;
+
+	dir = g_win32_get_package_installation_directory_of_module (NULL);
+	filename = g_build_filename(dir, "share", "gplugin", "gplugin-gtk",
 	                            "gplugin-gtk-plugin-info.ui", NULL);
+	g_free (dir);
 	gtk_builder_add_from_file(priv->builder, filename, &error);
 	if(error) {
 		g_warning("%s", error->message);