--- ./champlain/Makefile.am.orig	2016-03-27 11:42:41.898762400 +0200
+++ ./champlain/Makefile.am	2016-03-27 11:43:13.754834400 +0200
@@ -142,7 +142,6 @@
 AM_CPPFLAGS = 					\
 	$(DEPS_CFLAGS)				\
 	$(MEMPHIS_CFLAGS)			\
-	-DDATADIR=\""$(datadir)"\"		\
 	-I$(top_srcdir)				\
 	-DCHAMPLAIN_COMPILATION 		\
 	-DG_LOG_DOMAIN=\"$(PACKAGE_NAME)\"	\
--- ./demos/local-rendering.c.orig	2014-10-07 20:19:33.000000000 +0200
+++ ./demos/local-rendering.c	2016-03-27 11:42:41.914383900 +0200
@@ -26,7 +26,11 @@
 #include <string.h>
 #include <stdio.h>
 #include <unistd.h>
+#ifdef G_OS_WIN32
+#include <winsock2.h>
+#else
 #include <sys/socket.h>
+#endif
 
 #define N_COLS 2
 #define COL_ID 0