diff --git a/configure.ac b/configure.ac
index 9da2b0364..2bb5a63c8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -381,6 +381,7 @@ AC_CHECK_HEADERS([ \
 	ia.h \
 	iaf.h \
 	inttypes.h \
+	langinfo.h \
 	limits.h \
 	locale.h \
 	login.h \
@@ -433,6 +434,7 @@ AC_CHECK_HEADERS([ \
 	utmp.h \
 	utmpx.h \
 	vis.h \
+	wchar.h \
 ])
 
 # lastlog.h requires sys/time.h to be included first on Solaris
diff --git a/utf8.c b/utf8.c
index 6445b3766..f563d3738 100644
--- a/utf8.c
+++ b/utf8.c
@@ -23,7 +23,9 @@
 #include "includes.h"
 
 #include <sys/types.h>
-#include <langinfo.h>
+#ifdef HAVE_LANGINFO_H
+# include <langinfo.h>
+#endif
 #include <limits.h>
 #include <stdarg.h>
 #include <stdio.h>
@@ -32,7 +34,9 @@
 #if defined(HAVE_STRNVIS) && defined(HAVE_VIS_H) && !defined(BROKEN_STRNVIS)
 # include <vis.h>
 #endif
-#include <wchar.h>
+#ifdef HAVE_WCHAR_H
+# include <wchar.h>
+#endif
 
 #include "utf8.h"