diff --git a/ac/initialization.m4 b/ac/initialization.m4
index f7258f9a2..189c495b1 100644
--- a/ac/initialization.m4
+++ b/ac/initialization.m4
@@ -17,5 +17,5 @@ PKG_PROG_PKG_CONFIG
 
 dnl Check for headers
 AC_HEADER_STDC()
-AC_CHECK_HEADERS([inttypes.h stdint.h sys/types.h sys/syscall.h])
+AC_CHECK_HEADERS([inttypes.h stdint.h sys/types.h sys/syscall.h stropts.h])
 AC_CHECK_FUNCS([vsscanf syscall],,)
diff --git a/src/common/terminal.cpp b/src/common/terminal.cpp
index 6c616f806..b3186298c 100644
--- a/src/common/terminal.cpp
+++ b/src/common/terminal.cpp
@@ -18,6 +18,12 @@
 # if defined(HAVE_SYS_IOCTL_H) || defined(GWINSZ_IN_SYS_IOCTL)
 #  include <sys/ioctl.h>
 # endif // HAVE_SYS_IOCTL_H || GWINSZ_IN_SYS_IOCTL
+# if defined(HAVE_UNISTD_H)
+#  include <unistd.h>
+# endif // HAVE_UNISTD_H
+# if defined(HAVE_STROPTS_H)
+#  include <stropts.h>
+# endif // HAVE_STROPTS_H
 #endif  // HAVE_TIOCGWINSZ
 
 #include "common/terminal.h"
@@ -37,4 +43,3 @@ get_terminal_columns() {
   return DEFAULT_TERMINAL_COLUMNS;
 #endif  // HAVE_TIOCGWINSZ
 }
-