#ifdef HAVE_INTTYPES_H
# include <inttypes.h>
#endif
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
#ifdef ICONV_CONST
#undef ICONV_CONST
#endif
+#ifdef ICONV_OPTION
+#undef ICONV_OPTION
+#endif
#ifdef iconv_t
#undef iconv_t
#endif