diff --git a/common/ChangeLog b/common/ChangeLog
index e202658b0..da4bf9644 100644
--- a/common/ChangeLog
+++ b/common/ChangeLog
@@ -1,3 +1,11 @@
+2003-04-29  Werner Koch  <wk@gnupg.org>
+
+	* util.h (fopencokokie): Removed prototype and struct.
+
+	* fopencookie.c: Removed.
+
+	* maperror.c: Use system assuan.h
+
 2002-10-31  Neal H. Walfield  <neal@g10code.de>
 
 	* isascii.c: New file.
diff --git a/common/maperror.c b/common/maperror.c
index ab03669ae..e3e18e4a1 100644
--- a/common/maperror.c
+++ b/common/maperror.c
@@ -27,10 +27,10 @@
 #include <unistd.h>
 
 #include <ksba.h>
+#include <assuan.h>
 
 #include "util.h"
 #include "errors.h"
-#include "../assuan/assuan.h"
 
 /* Note: we might want to wrap this in a macro to get our hands on
    the line and file where the error occured */
diff --git a/common/util.h b/common/util.h
index a863f2078..ef988f672 100644
--- a/common/util.h
+++ b/common/util.h
@@ -1,5 +1,5 @@
 /* util.h - Utility functions for Gnupg
- *	Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+ *	Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -75,19 +75,6 @@ int vasprintf (char **result, const char *format, va_list *args);
 int asprintf (char **result, const char *format, ...);
 #endif
 
-#if !HAVE_FOPENCOOKIE
-typedef struct
-{
-  ssize_t (*read)(void*,char*,size_t);
-  ssize_t (*write)(void*,const char*,size_t);
-  int (*seek)(void*,off_t*,int);
-  int (*close)(void*);
-} _IO_cookie_io_functions_t;
-typedef _IO_cookie_io_functions_t cookie_io_functions_t;
-FILE *fopencookie (void *cookie, const char *opentype,
-                   cookie_io_functions_t funclist);
-#endif /*!HAVE_FOPENCOOKIE*/
-
 
 
 /*-- some macros to replace ctype ones and avoid locale problems --*/
@@ -107,11 +94,3 @@ FILE *fopencookie (void *cookie, const char *opentype,
 
 
 #endif /*GNUPG_COMMON_UTIL_H*/
-
-
-
-
-
-
-
-