8 files changed, 166 insertions, 0 deletions
diff --git a/gnulib-local/lib/unicase.h.diff b/gnulib-local/lib/unicase.h.diff
new file mode 100644
index 00000000..13817709
--- /dev/null
+++ b/gnulib-local/lib/unicase.h.diff
@@ -0,0 +1,19 @@
+*** unicase.h.orig	2009-04-05 19:30:26.000000000 +0200
+--- unicase.h	2009-04-10 16:21:23.000000000 +0200
+***************
+*** 20,26 ****
+  #include "unitypes.h"
+  
+  /* Get bool.  */
+! #include <stdbool.h>
+  
+  /* Get size_t.  */
+  #include <stddef.h>
+--- 20,26 ----
+  #include "unitypes.h"
+  
+  /* Get bool.  */
+! #include <unistring/stdbool.h>
+  
+  /* Get size_t.  */
+  #include <stddef.h>
diff --git a/gnulib-local/lib/uniconv.h.diff b/gnulib-local/lib/uniconv.h.diff
new file mode 100644
index 00000000..d6403230
--- /dev/null
+++ b/gnulib-local/lib/uniconv.h.diff
@@ -0,0 +1,28 @@
+*** uniconv.h.orig	2009-04-10 23:40:31.000000000 +0200
+--- uniconv.h	2009-04-10 23:41:19.000000000 +0200
+***************
+*** 23,35 ****
+  #include "unitypes.h"
+  
+  /* Get enum iconv_ilseq_handler.  */
+! #include "iconveh.h"
+! 
+! /* Get uniconv_register_autodetect() declaration.  */
+! #include "striconveha.h"
+  
+  /* Get locale_charset() declaration.  */
+! #include "localcharset.h"
+  
+  
+  #ifdef __cplusplus
+--- 23,32 ----
+  #include "unitypes.h"
+  
+  /* Get enum iconv_ilseq_handler.  */
+! #include <unistring/iconveh.h>
+  
+  /* Get locale_charset() declaration.  */
+! #include <unistring/localcharset.h>
+  
+  
+  #ifdef __cplusplus
diff --git a/gnulib-local/lib/unictype.h.diff b/gnulib-local/lib/unictype.h.diff
new file mode 100644
index 00000000..14347bc1
--- /dev/null
+++ b/gnulib-local/lib/unictype.h.diff
@@ -0,0 +1,24 @@
+*** unictype.h.orig	2009-04-05 12:15:57.000000000 +0200
+--- unictype.h	2009-04-12 04:31:36.000000000 +0200
+***************
+*** 19,26 ****
+  
+  #include "unitypes.h"
+  
+  /* Get bool.  */
+! #include <stdbool.h>
+  
+  /* Get size_t.  */
+  #include <stddef.h>
+--- 19,29 ----
+  
+  #include "unitypes.h"
+  
++ /* Get LIBUNISTRING_DLL_VARIABLE.  */
++ #include <unistring/woe32dll.h>
++ 
+  /* Get bool.  */
+! #include <unistring/stdbool.h>
+  
+  /* Get size_t.  */
+  #include <stddef.h>
diff --git a/gnulib-local/lib/unilbrk.h.diff b/gnulib-local/lib/unilbrk.h.diff
new file mode 100644
index 00000000..a5b86c3d
--- /dev/null
+++ b/gnulib-local/lib/unilbrk.h.diff
@@ -0,0 +1,19 @@
+*** unilbrk.h.orig	2008-05-10 14:46:17.000000000 +0200
+--- unilbrk.h	2009-04-10 22:39:40.000000000 +0200
+***************
+*** 24,30 ****
+  #include "unitypes.h"
+  
+  /* Get locale_charset() declaration.  */
+! #include "localcharset.h"
+  
+  
+  #ifdef __cplusplus
+--- 24,30 ----
+  #include "unitypes.h"
+  
+  /* Get locale_charset() declaration.  */
+! #include <unistring/localcharset.h>
+  
+  
+  #ifdef __cplusplus
diff --git a/gnulib-local/lib/uninorm.h.diff b/gnulib-local/lib/uninorm.h.diff
new file mode 100644
index 00000000..89d89950
--- /dev/null
+++ b/gnulib-local/lib/uninorm.h.diff
@@ -0,0 +1,14 @@
+*** uninorm.h.orig	2009-04-05 12:38:24.000000000 +0200
+--- uninorm.h	2009-04-12 04:31:52.000000000 +0200
+***************
+*** 18,23 ****
+--- 18,26 ----
+  #ifndef _UNINORM_H
+  #define _UNINORM_H
+  
++ /* Get LIBUNISTRING_DLL_VARIABLE.  */
++ #include <unistring/woe32dll.h>
++ 
+  /* Get size_t.  */
+  #include <stddef.h>
+  
diff --git a/gnulib-local/lib/unistr.h.diff b/gnulib-local/lib/unistr.h.diff
new file mode 100644
index 00000000..4572049a
--- /dev/null
+++ b/gnulib-local/lib/unistr.h.diff
@@ -0,0 +1,24 @@
+*** unistr.h.orig	2009-04-05 12:22:17.000000000 +0200
+--- unistr.h	2009-04-10 18:57:37.000000000 +0200
+***************
+*** 19,26 ****
+  
+  #include "unitypes.h"
+  
+  /* Get bool.  */
+! #include <stdbool.h>
+  
+  /* Get size_t.  */
+  #include <stddef.h>
+--- 19,29 ----
+  
+  #include "unitypes.h"
+  
++ /* Get inline if available.  */
++ #include <unistring/inline.h>
++ 
+  /* Get bool.  */
+! #include <unistring/stdbool.h>
+  
+  /* Get size_t.  */
+  #include <stddef.h>
diff --git a/gnulib-local/lib/unitypes.h.diff b/gnulib-local/lib/unitypes.h.diff
new file mode 100644
index 00000000..39597ffd
--- /dev/null
+++ b/gnulib-local/lib/unitypes.h.diff
@@ -0,0 +1,19 @@
+*** unitypes.h.orig	2009-04-05 19:30:36.000000000 +0200
+--- unitypes.h	2009-04-10 16:22:07.000000000 +0200
+***************
+*** 18,24 ****
+  #define _UNITYPES_H
+  
+  /* Get uint8_t, uint16_t, uint32_t.  */
+! #include <stdint.h>
+  
+  /* Type representing a Unicode character.  */
+  typedef uint32_t ucs4_t;
+--- 18,24 ----
+  #define _UNITYPES_H
+  
+  /* Get uint8_t, uint16_t, uint32_t.  */
+! #include <unistring/stdint.h>
+  
+  /* Type representing a Unicode character.  */
+  typedef uint32_t ucs4_t;
diff --git a/gnulib-local/lib/uniwidth.h.diff b/gnulib-local/lib/uniwidth.h.diff
new file mode 100644
index 00000000..7448d4c0
--- /dev/null
+++ b/gnulib-local/lib/uniwidth.h.diff
@@ -0,0 +1,19 @@
+*** uniwidth.h.orig	2007-10-07 17:24:38.000000000 +0200
+--- uniwidth.h	2009-04-10 22:39:46.000000000 +0200
+***************
+*** 23,29 ****
+  #include <stddef.h>
+  
+  /* Get locale_charset() declaration.  */
+! #include "localcharset.h"
+  
+  #ifdef __cplusplus
+  extern "C" {
+--- 23,29 ----
+  #include <stddef.h>
+  
+  /* Get locale_charset() declaration.  */
+! #include <unistring/localcharset.h>
+  
+  #ifdef __cplusplus
+  extern "C" {