--- lib/idna.h.orig	Wed Dec 21 08:03:15 2011
+++ lib/idna.h	Wed Dec 21 08:05:57 2011
@@ -36,7 +36,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	Wed Dec 21 08:03:20 2011
+++ lib/pr29.h	Wed Dec 21 08:06:20 2011
@@ -44,7 +44,7 @@
 # include <stdlib.h>
 
   /* Get uint32_t. */
-# include <idn-int.h>
+# include <idn/idn-int.h>
 
   /* Error codes. */
   typedef enum
--- lib/punycode.h.orig	Wed Dec 21 08:03:26 2011
+++ lib/punycode.h	Wed Dec 21 08:06:49 2011
@@ -81,7 +81,7 @@
 #endif
 
 #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	Wed Dec 21 08:03:32 2011
+++ lib/stringprep.h	Wed Dec 21 08:07:08 2011
@@ -36,7 +36,7 @@
 
 # include <stddef.h>		/* size_t */
 # include <unistd.h>		/* ssize_t */
-# include <idn-int.h>		/* uint32_t */
+# include <idn/idn-int.h>	/* uint32_t */
 
 # ifdef __cplusplus
 extern "C"
--- lib/tld.h.orig	Wed Dec 21 08:03:38 2011
+++ lib/tld.h	Wed Dec 21 08:07:20 2011
@@ -47,7 +47,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