--- a/tagutils/tagutils-misc.c
+++ b/tagutils/tagutils-misc.c
@@ -33,10 +33,10 @@
 
 static iconv_result
 do_iconv(const char* to_ces, const char* from_ces,
-	 char *inbuf,  size_t inbytesleft,
+	 ICONV_CONST char *inbuf,  size_t inbytesleft,
 	 char *outbuf_orig, size_t outbytesleft_orig)
 {
-#ifdef HAVE_ICONV_H
+#ifdef HAVE_ICONV
 	size_t rc;
 	iconv_result ret = ICONV_OK;
 
@@ -65,9 +65,9 @@
 	iconv_close(cd);
 
 	return ret;
-#else // HAVE_ICONV_H
+#else // HAVE_ICONV
 	return ICONV_FATAL;
-#endif // HAVE_ICONV_H
+#endif // HAVE_ICONV
 }
 
 #define N_LANG_ALT 8