diff --git a/common/ChangeLog b/common/ChangeLog
index 8cb0f1efe..5247415ce 100644
--- a/common/ChangeLog
+++ b/common/ChangeLog
@@ -1,3 +1,12 @@
+2010-06-08  Marcus Brinkmann  <marcus@g10code.de>
+
+	* Makefile.am (AM_CFLAGS): Add $(LIBASSUAN_CFLAGS).
+	(t_common_ldadd): Add $(LIBASSUAN_LIBS).
+	* sysutils.c: Include <assuan.h>.
+	(translate_sys2libc_fd_int): Cast to silence gcc warning.
+	* iobuf.c: Include <assuan.h>
+	(translate_file_handle): Fix syntax error.	
+
 2010-06-08  Werner Koch  <wk@g10code.com>
 
 	* iobuf.c (translate_file_handle) [W32CE]: Handle rendezvous ids.
diff --git a/common/Makefile.am b/common/Makefile.am
index de9e8f5ce..26c8233e4 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -34,7 +34,7 @@ CLEANFILES = audit-events.h status-codes.h
 
 AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/intl
 
-AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS)
+AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(LIBASSUAN_CFLAGS) $(KSBA_CFLAGS)
 
 include $(top_srcdir)/am/cmacros.am
 
@@ -168,7 +168,7 @@ module_maint_tests = t-helpfile t-b64
 
 
 t_common_ldadd = libcommon.a ../gl/libgnu.a \
-                 $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) $(LIBICONV)
+                 $(LIBGCRYPT_LIBS) $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) $(LIBICONV)
 
 # jnlib tests
 t_stringhelp_SOURCES = t-stringhelp.c $(t_jnlib_src)
diff --git a/common/iobuf.c b/common/iobuf.c
index 20649bda1..b9bed3218 100644
--- a/common/iobuf.c
+++ b/common/iobuf.c
@@ -37,6 +37,8 @@
 # include <swis.h>
 #endif /* __riscos__ */
 
+#include <assuan.h>
+
 #include "util.h"
 #include "sysutils.h"
 #include "iobuf.h"
@@ -2366,11 +2368,11 @@ iobuf_read_line (iobuf_t a, byte ** addr_of_buffer,
 static int
 translate_file_handle (int fd, int for_write)
 {
-#if defined (HAVE_W32CE_SYSTEM)
+#if defined(HAVE_W32CE_SYSTEM)
   /* This is called only with one of the special filenames.  Under
      W32CE the FD here is not a file descriptor but a rendezvous id,
      thus we need to finish the pipe first.  */
-  fd = _assuan_w32ce_finish_pipe fd, for_write);
+  fd = _assuan_w32ce_finish_pipe (fd, for_write);
 #elif defined(HAVE_W32_SYSTEM)
   {
     int x;
diff --git a/common/sysutils.c b/common/sysutils.c
index 25dd6a7c4..50f70b043 100644
--- a/common/sysutils.c
+++ b/common/sysutils.c
@@ -51,6 +51,8 @@
 #endif
 #include <fcntl.h>
 
+#include <assuan.h>
+
 #include "setenv.h"   /* Gnulib replacement.  */
 
 #include "util.h"
@@ -306,7 +308,7 @@ int
 translate_sys2libc_fd_int (int fd, int for_write)
 {
 #if HAVE_W32CE_SYSTEM
-  fd = _assuan_w32ce_finish_pipe fd, for_write);
+  fd = (int) _assuan_w32ce_finish_pipe (fd, for_write);
   return translate_sys2libc_fd ((void*)fd, for_write);
 #elif HAVE_W32_SYSTEM
   if (fd <= 2)