*** ./dcigettext.c.0	2006-09-12 12:35:55.790190120 +0200
--- ./dcigettext.c	2006-09-12 12:36:00.667448664 +0200
*************** extern int errno;
*** 67,74 ****
  # include <unistd.h>
  #endif
  
- #include <locale.h>
- 
  #ifdef _LIBC
    /* Guess whether integer division by zero raises signal SIGFPE.
       Set to 1 only if you know for sure.  In case of doubt, set to 0.  */
--- 67,72 ----
*************** extern int errno;
*** 96,101 ****
--- 94,103 ----
  #endif
  #include "hash-string.h"
  
+ /* This must come _after_ libintl.h or libgnuintl.h for Solaris
+    because it will in turn include them.  */
+ #include <locale.h>
+ 
  /* Thread safetyness.  */
  #ifdef _LIBC
  # include <bits/libc-lock.h>
*** ./dgettext.c.0	2006-09-12 12:35:55.794189512 +0200
--- ./dgettext.c	2006-09-12 12:39:37.411498560 +0200
***************
*** 22,35 ****
  
  #include "gettextP.h"
  
- #include <locale.h>
- 
  #ifdef _LIBC
  # include <libintl.h>
  #else
  # include "libgnuintl.h"
  #endif
  
  /* @@ end of prolog @@ */
  
  /* Names for the libintl functions are a problem.  They must not clash
--- 22,37 ----
  
  #include "gettextP.h"
  
  #ifdef _LIBC
  # include <libintl.h>
  #else
  # include "libgnuintl.h"
  #endif
  
+ /* This must come _after_ libintl.h or libgnuintl.h for Solaris
+    because it will in turn include them.  */
+ #include <locale.h>
+ 
  /* @@ end of prolog @@ */
  
  /* Names for the libintl functions are a problem.  They must not clash
*** ./dngettext.c.0	2006-09-12 12:35:55.792189816 +0200
--- ./dngettext.c	2006-09-12 12:39:49.876603576 +0200
***************
*** 22,35 ****
  
  #include "gettextP.h"
  
- #include <locale.h>
- 
  #ifdef _LIBC
  # include <libintl.h>
  #else
  # include "libgnuintl.h"
  #endif
  
  /* @@ end of prolog @@ */
  
  /* Names for the libintl functions are a problem.  They must not clash
--- 22,37 ----
  
  #include "gettextP.h"
  
  #ifdef _LIBC
  # include <libintl.h>
  #else
  # include "libgnuintl.h"
  #endif
  
+ /* This must come _after_ libintl.h or libgnuintl.h for Solaris
+    because it will in turn include them.  */
+ #include <locale.h>
+ 
  /* @@ end of prolog @@ */
  
  /* Names for the libintl functions are a problem.  They must not clash
*** ./ngettext.c.0	2006-09-12 12:35:55.797189056 +0200
--- ./ngettext.c	2006-09-12 12:36:07.383427680 +0200
***************
*** 34,39 ****
--- 34,41 ----
  # include "libgnuintl.h"
  #endif
  
+ /* This must come _after_ libintl.h or libgnuintl.h for Solaris
+    because it will in turn include them.  */
  #include <locale.h>
  
  /* @@ end of prolog @@ */