diff --git a/include/SDL_stdinc.h b/include/SDL_stdinc.h
index 9862249a6..9f4fc85fb 100644
--- a/include/SDL_stdinc.h
+++ b/include/SDL_stdinc.h
@@ -70,7 +70,7 @@
 #ifdef HAVE_CTYPE_H
 # include <ctype.h>
 #endif
-#ifdef HAVE_ICONV_H
+#if defined(HAVE_ICONV) && defined(HAVE_ICONV_H)
 # include <iconv.h>
 #endif
 
@@ -583,7 +583,7 @@ extern DECLSPEC int SDLCALL SDL_vsnprintf(char *text, size_t maxlen, const char
 #define SDL_ICONV_EINVAL	(size_t)-4
 /*@}*/
 
-#ifdef HAVE_ICONV_H
+#if defined(HAVE_ICONV) && defined(HAVE_ICONV_H)
 #define SDL_iconv_t     iconv_t
 #define SDL_iconv_open  iconv_open
 #define SDL_iconv_close iconv_close