diff --git a/CHANGES b/CHANGES
index 6c89a2f629..8bc8ee1421 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,9 @@ Daniel Fandrich (14 Nov 2008)
 - Added .xml as one of the few common file extensions known by the multipart
   form generator.
 
+- Added some #ifdefs around header files and change the EAGAIN test to
+  fix compilation on Cell (reported by Jeff Curley).
+
 Yang Tse (13 Nov 2008)
 - Refactored configure script detection of functions used to set sockets into
   non-blocking mode, and decouple function detection from function capability.
diff --git a/lib/connect.c b/lib/connect.c
index f2b15da822..30cd1535bd 100644
--- a/lib/connect.c
+++ b/lib/connect.c
@@ -848,12 +848,14 @@ singleipconnect(struct connectdata *conn,
     switch (error) {
     case EINPROGRESS:
     case EWOULDBLOCK:
-#if defined(EAGAIN) && EAGAIN != EWOULDBLOCK
+#if defined(EAGAIN)
+#if (EAGAIN) != (EWOULDBLOCK)
       /* On some platforms EAGAIN and EWOULDBLOCK are the
        * same value, and on others they are different, hence
        * the odd #if
        */
     case EAGAIN:
+#endif
 #endif
       rc = waitconnect(sockfd, timeout_ms);
       break;
diff --git a/lib/dict.c b/lib/dict.c
index 6bd75f6dc1..7fadfe892e 100644
--- a/lib/dict.c
+++ b/lib/dict.c
@@ -53,7 +53,9 @@
 #ifdef HAVE_NET_IF_H
 #include <net/if.h>
 #endif
+#ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
+#endif
 
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
diff --git a/lib/file.c b/lib/file.c
index b0af2fcd90..d1302ab816 100644
--- a/lib/file.c
+++ b/lib/file.c
@@ -57,7 +57,9 @@
 #ifdef HAVE_NET_IF_H
 #include <net/if.h>
 #endif
+#ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
+#endif
 
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
diff --git a/lib/telnet.c b/lib/telnet.c
index 4d405b621c..d9c5f07b79 100644
--- a/lib/telnet.c
+++ b/lib/telnet.c
@@ -52,7 +52,9 @@
 #ifdef HAVE_NET_IF_H
 #include <net/if.h>
 #endif
+#ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
+#endif
 
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
diff --git a/lib/tftp.c b/lib/tftp.c
index e58365c10a..15849c5e51 100644
--- a/lib/tftp.c
+++ b/lib/tftp.c
@@ -52,7 +52,9 @@
 #ifdef HAVE_NET_IF_H
 #include <net/if.h>
 #endif
+#ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
+#endif
 
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
diff --git a/lib/transfer.c b/lib/transfer.c
index 35443bf2fd..4313680efb 100644
--- a/lib/transfer.c
+++ b/lib/transfer.c
@@ -63,7 +63,9 @@
 #ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
 #endif
+#ifdef HAVE_SIGNAL_H
 #include <signal.h>
+#endif
 
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>