--- a/components/libidn/patches/002-includes.patch	Mon Oct 10 14:27:08 2016 -0700
+++ b/components/libidn/patches/002-includes.patch	Tue Oct 11 06:48:16 2016 -0700
@@ -2,8 +2,41 @@
 
 This patch will be sent upstream.
 
---- lib/stringprep.h.orig	2016-03-29 07:36:25.142643305 -0700
-+++ lib/stringprep.h	2016-03-29 07:36:48.406250204 -0700
+--- lib/idna.h.orig	2016-10-10 08:33:08.794007533 +0000
++++ lib/idna.h	2016-10-10 08:35:30.003511529 +0000
+@@ -43,7 +43,7 @@
+ # endif
+ 
+ # include <stddef.h>		/* size_t */
+-# include <idn-int.h>		/* uint32_t */
++# include <idn/idn-int.h>	/* uint32_t */
+ 
+ # ifdef __cplusplus
+ extern "C"
+--- lib/pr29.h.orig	2016-10-10 08:33:17.881709287 +0000
++++ lib/pr29.h	2016-10-10 08:35:43.197719107 +0000
+@@ -51,7 +51,7 @@
+ # include <stdlib.h>
+ 
+   /* Get uint32_t. */
+-# include <idn-int.h>
++# include <idn/idn-int.h>
+ 
+   /* Error codes. */
+   typedef enum
+--- lib/punycode.h.orig	2016-10-10 08:33:24.538122517 +0000
++++ lib/punycode.h	2016-10-10 08:35:57.135867425 +0000
+@@ -87,7 +87,7 @@
+ /* Public interface (would normally go in its own .h file): */
+ 
+ #include <stddef.h>		/* size_t */
+-#include <idn-int.h>		/* uint32_t */
++#include <idn/idn-int.h>	/* uint32_t */
+ 
+   enum punycode_status
+   {
+--- lib/stringprep.h.orig	2016-10-10 08:35:02.991412123 +0000
++++ lib/stringprep.h	2016-10-10 08:28:52.349467569 +0000
 @@ -44,7 +44,7 @@
  
  # include <stddef.h>		/* size_t */
@@ -13,3 +46,14 @@
  
  # ifdef __cplusplus
  extern "C"
+--- lib/tld.h.orig	2016-10-10 08:33:38.403769891 +0000
++++ lib/tld.h	2016-10-10 08:36:29.358177481 +0000
+@@ -54,7 +54,7 @@
+ # include <stdlib.h>
+ 
+   /* Get uint32_t. */
+-# include <idn-int.h>
++# include <idn/idn-int.h>
+ 
+   /* Interval of valid code points in the TLD. */
+   struct Tld_table_element