Index: configure.ac
==================================================================
--- configure.ac
+++ configure.ac
@@ -1970,11 +1970,11 @@
 	AC_SUBST(OF_SUBPROCESS_M, "OFSubprocess.m")
 	AC_DEFINE(OF_HAVE_SUBPROCESSES, 1, [Whether we have subprocesses])
 ])
 
 AC_CHECK_HEADERS_ONCE([complex.h sys/ioctl.h sys/ttycom.h])
-AC_CHECK_FUNCS(isatty)
+AC_CHECK_FUNCS(ioctl isatty)
 
 AC_CHECK_FUNC(pledge, [
 	AC_DEFINE(OF_HAVE_PLEDGE, 1, [Whether we have pledge()])
 ])
 

Index: src/OFStdIOStream.m
==================================================================
--- src/OFStdIOStream.m
+++ src/OFStdIOStream.m
@@ -439,11 +439,11 @@
 #endif
 }
 
 - (int)columns
 {
-#if defined(HAVE_SYS_IOCTL_H) && defined(TIOCGWINSZ) && \
+#if defined(HAVE_IOCTL) && defined(TIOCGWINSZ) && \
     !defined(OF_AMIGAOS) && !defined(OF_WII_U)
 	struct winsize ws;
 
 	if (ioctl(_fd, TIOCGWINSZ, &ws) != 0)
 		return -1;
@@ -454,11 +454,11 @@
 #endif
 }
 
 - (int)rows
 {
-#if defined(HAVE_SYS_IOCTL_H) && defined(TIOCGWINSZ) && \
+#if defined(HAVE_IOCTL) && defined(TIOCGWINSZ) && \
     !defined(OF_AMIGAOS) && !defined(OF_WII_U)
 	struct winsize ws;
 
 	if (ioctl(_fd, TIOCGWINSZ, &ws) != 0)
 		return -1;

Index: src/OFSystemInfo.m
==================================================================
--- src/OFSystemInfo.m
+++ src/OFSystemInfo.m
@@ -981,11 +981,11 @@
 }
 
 static bool
 queryNetworkInterfaceIPv4Addresses(OFMutableDictionary *ret)
 {
-# if defined(HAVE_SYS_IOCTL_H) && defined(HAVE_NET_IF_H)
+# if defined(HAVE_IOCTL) && defined(HAVE_NET_IF_H)
 	OFStringEncoding encoding = [OFLocale encoding];
 	int sock = socket(AF_INET, SOCK_DGRAM, 0);
 	struct ifconf ifc;
 	struct ifreq *ifrs;
 	OFMutableDictionary *interface;