diff --git a/ChangeLog b/ChangeLog
index 5162755bd..1a955b9c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat May 24 21:38:47 EEST 2008 (edwin)
+-------------------------------------
+  * clamd/others.c, session.c, m4/fdpassing.m4:
+	remove duplicate code, and fix build error (bb #1034)
+
 Wed May 21 15:51:32 CEST 2008 (tk)
 ----------------------------------
   * freshclam/fresclam.c: don't call daemonize() under w32 (bb#1002)
diff --git a/clamd/session.c b/clamd/session.c
index da9a0366c..f88016f51 100644
--- a/clamd/session.c
+++ b/clamd/session.c
@@ -41,8 +41,10 @@
 
 #include <sys/socket.h>
 #ifdef HAVE_FD_PASSING
+#ifdef HAVE_SYS_UIO_H
 #include <sys/uio.h>
 #endif
+#endif
 
 #include <sys/time.h>
 #endif
diff --git a/configure b/configure
index 482614416..4bcf7d82d 100755
--- a/configure
+++ b/configure
@@ -18771,9 +18771,13 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 #define _XOPEN_SOURCE 500
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
 #include <sys/socket.h>
+#ifdef HAVE_SYS_UIO_H
 #include <sys/uio.h>
+#endif
 
 int
 main ()
@@ -18850,13 +18854,17 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
 #include <sys/wait.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
+#ifdef HAVE_SYS_UIO_H
 #include <sys/uio.h>
+#endif
 #include <signal.h>
 #include <sys/socket.h>
 
@@ -19026,13 +19034,17 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 #define _XOPEN_SOURCE 500
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
 #include <sys/wait.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
+#ifdef HAVE_SYS_UIO_H
 #include <sys/uio.h>
+#endif
 #include <signal.h>
 #include <sys/socket.h>
 
diff --git a/m4/fdpassing.m4 b/m4/fdpassing.m4
index a25fe78bd..ab629a32d 100644
--- a/m4/fdpassing.m4
+++ b/m4/fdpassing.m4
@@ -2,13 +2,17 @@
 AC_DEFUN([CONFTEST_FDPASS],[[
 AC_LANG_SOURCE([[
 $1 
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
 #include <sys/wait.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
+#ifdef HAVE_SYS_UIO_H
 #include <sys/uio.h>
+#endif
 #include <signal.h>
 #include <sys/socket.h>
 
@@ -140,9 +144,13 @@ AC_CACHE_CHECK([for msg_control field in struct msghdr],
     AC_TRY_COMPILE(
 [
 #define _XOPEN_SOURCE 500
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
 #include <sys/socket.h>
+#ifdef HAVE_SYS_UIO_H
 #include <sys/uio.h>
+#endif
 ],
 [
 #ifdef msg_control