Define the mailcap structure in types.h

and include <types.h> in mailcap.h

@@ -18,17 +18,11 @@
 #ifndef _MAILUTILS_MAILCAP_H
 #define _MAILUTILS_MAILCAP_H
 
-#include <mailutils/stream.h>
+#include <mailutils/types.h>
 #include <mailutils/errno.h>
 
 /* See RFC1524 (A User Agent Configuration Mechanism).  */
 
-struct _mu_mailcap;
-struct _mu_mailcap_entry;
-
-typedef struct _mu_mailcap* mu_mailcap_t;
-typedef struct _mu_mailcap_entry* mu_mailcap_entry_t;
-
 /* Create a mailcap from stream.  */
 int mu_mailcap_create (mu_mailcap_t * mailcap, stream_t stream);
 

@@ -57,6 +57,8 @@ struct _mailbox;
 struct _mailer;
 struct _message;
 struct _mime;
+struct _mu_mailcap;
+struct _mu_mailcap_entry;
 struct _observable;
 struct _observer;
 struct _property;
@@ -83,6 +85,8 @@ typedef struct _mailbox *mailbox_t;
 typedef struct _mailer *mailer_t;
 typedef struct _message *message_t;
 typedef struct _mime *mime_t;
+typedef struct _mu_mailcap *mu_mailcap_t;
+typedef struct _mu_mailcap_entry *mu_mailcap_entry_t;
 typedef struct _observable *observable_t;
 typedef struct _observer *observer_t;
 typedef struct _property *property_t;