diff --git a/library/changes b/library/changes
index a6793c5..b8d0d78 100644
--- a/library/changes
+++ b/library/changes
@@ -1,3 +1,7 @@
+- The <sys/ioctl.h> header file now includes both <sys/select.h> and
+  <sys/filio.h> for better compatibility with the TCP/IP stack header
+  files.
+
 - Added the global variable __expand_wildcard_args which can be used
   to disable wildcard pattern expansion of command line parameters when
   linked against "libunix.a". Note that this has no effect on the "regular"
diff --git a/library/include/sys/ioctl.h b/library/include/sys/ioctl.h
index eab2fa9..58b305b 100644
--- a/library/include/sys/ioctl.h
+++ b/library/include/sys/ioctl.h
@@ -1,5 +1,5 @@
 /*
- * $Id: ioctl.h,v 1.4 2006-01-08 12:06:14 obarthel Exp $
+ * $Id: ioctl.h,v 1.5 2006-06-21 15:53:55 obarthel Exp $
  *
  * :ts=4
  *
@@ -47,6 +47,16 @@
 
 /****************************************************************************/
 
+#ifndef _SYS_SELECT_H
+#include <sys/select.h>
+#endif /* _SYS_SELECT_H */
+
+#ifndef _SYS_FILIO_H
+#include <sys/filio.h>
+#endif /* _SYS_FILIO_H */
+
+/****************************************************************************/
+
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */