Got tired of recompiling EVERYTHING when I touched locker.h, so started

splitting common types into <mailutils/types.h>.

@@ -19,15 +19,14 @@
 #define _MAILUTILS_ADDRESS_H
 
 #include <sys/types.h>
+
 #include <mailutils/mu_features.h>
+#include <mailutils/types.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-struct _address;
-typedef struct _address *address_t;
-
 extern int address_create   __P ((address_t *, const char *));
 extern int address_createv  __P ((address_t *, const char *v[], size_t));
 extern void address_destroy __P ((address_t *));

@@ -19,15 +19,14 @@
 #define _MAILUTILS_LOCKER_H
 
 #include <mailutils/mu_features.h>
+#include <mailutils/types.h>
+
 #include <sys/types.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-struct _locker;
-typedef struct _locker *locker_t;
-
 /* lock expiry time */
 #define MU_LOCKER_EXPIRE_TIME        (10 * 60)
 #define MU_LOCKER_RETRIES            (10)
@@ -76,4 +75,5 @@ extern int locker_remove_lock   __P ((locker_t));
 }
 #endif
 
-#endif /* _MAILUTILS_MAILBOX_H */
+#endif
+

@@ -19,20 +19,17 @@
 #define _MAILUTILS_MAILBOX_H
 
 #include <sys/types.h>
-#include <mailutils/mu_features.h>
-
-/* Forward declaration.  */
-struct _mailbox;
-typedef struct _mailbox *mailbox_t;
 
-#include <mailutils/url.h>
-#include <mailutils/observer.h>
 #include <mailutils/debug.h>
-#include <mailutils/property.h>
-#include <mailutils/message.h>
+#include <mailutils/folder.h>
 #include <mailutils/locker.h>
+#include <mailutils/message.h>
+#include <mailutils/mu_features.h>
+#include <mailutils/observer.h>
+#include <mailutils/property.h>
 #include <mailutils/stream.h>
-#include <mailutils/folder.h>
+#include <mailutils/types.h>
+#include <mailutils/url.h>
 
 #ifdef __cplusplus
 extern "C" {

@@ -19,11 +19,6 @@
 #define _MAILUTILS_MESSAGE_H
 
 #include <sys/types.h>
-#include <mailutils/mu_features.h>
-
-/* forward declaration */
-struct _message;
-typedef struct _message *message_t;
 
 #include <mailutils/attribute.h>
 #include <mailutils/auth.h>
@@ -31,6 +26,7 @@ typedef struct _message *message_t;
 #include <mailutils/envelope.h>
 #include <mailutils/header.h>
 #include <mailutils/mailbox.h>
+#include <mailutils/mu_features.h>
 #include <mailutils/observer.h>
 #include <mailutils/stream.h>
 

+/* GNU mailutils - a suite of utilities for electronic mail
+   Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Library Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+
+#ifndef _MAILUTILS_TYPES_H
+#define _MAILUTILS_TYPES_H
+
+#include <mailutils/mu_features.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct _locker;
+struct _mailbox;
+struct _message;
+struct _address;
+
+typedef struct _locker  *locker_t;
+typedef struct _mailbox *mailbox_t;
+typedef struct _message *message_t;
+typedef struct _address *address_t;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+