diff --git a/binutils/binutils/winduni.c b/binutils/binutils/winduni.c

index bf5dbd4..8aa4d78 100644

--- a/binutils/binutils/winduni.c

+++ b/binutils/binutils/winduni.c

@@ -42,7 +42,7 @@

 #include "winduni.h"

 #include "safe-ctype.h"

-#if HAVE_ICONV_H

+#if HAVE_ICONV

 #include <iconv.h>

 #endif

@@ -616,7 +616,7 @@ codepage_from_unicode (rc_uint_type *length, const unichar *unicode, char **asci

     *length = len;

 }

-#ifdef HAVE_ICONV_H

+#ifdef HAVE_ICONV

 static int

 iconv_onechar (iconv_t cd, const char *s, char *d, int d_len, const char **n_s, char **n_d)

 {

@@ -652,7 +652,7 @@ wind_iconv_cp (rc_uint_type cp)

     return NULL;

   return lim->iconv_name;

 }

-#endif /* HAVE_ICONV_H */

+#endif /* HAVE_ICONV */

 static rc_uint_type

 wind_MultiByteToWideChar (rc_uint_type cp, const char *mb,

@@ -666,7 +666,7 @@ wind_MultiByteToWideChar (rc_uint_type cp, const char *mb,

   /* Convert to bytes. */

   ret *= sizeof (unichar);

-#elif defined (HAVE_ICONV_H)

+#elif defined (HAVE_ICONV)

   int first = 1;

   char tmp[32];

   char *p_tmp;

@@ -739,7 +739,7 @@ wind_WideCharToMultiByte (rc_uint_type cp, const unichar *u, char *mb, rc_uint_t

   ret = (rc_uint_type) WideCharToMultiByte (cp, 0, u, -1, mb, mb_len,

 				      	    NULL, & used_def);

-#elif defined (HAVE_ICONV_H)

+#elif defined (HAVE_ICONV)

   int first = 1;

   char tmp[32];

   char *p_tmp;