diff -up gmime-2.2.10/util/list.h.accidental-exports gmime-2.2.10/util/list.h
--- gmime-2.2.10/util/list.h.accidental-exports	2007-10-12 14:39:28.000000000 -0400
+++ gmime-2.2.10/util/list.h	2007-10-12 14:39:39.000000000 -0400
@@ -21,7 +21,7 @@
 #ifndef __LIST_H__
 #define __LIST_H__
 
-#include <glib/gmacros.h>
+#include <glib.h>
 
 #include <string.h>
 
@@ -40,19 +40,19 @@ typedef struct {
 
 #define LIST_INITIALIZER(l) { (ListNode *) &l.tail, NULL, (ListNode *) &l.head }
 
-void list_init (List *list);
+G_GNUC_INTERNAL void list_init (List *list);
 
-int list_is_empty (List *list);
+G_GNUC_INTERNAL int list_is_empty (List *list);
 
-int list_length (List *list);
+G_GNUC_INTERNAL int list_length (List *list);
 
-ListNode *list_unlink_head (List *list);
-ListNode *list_unlink_tail (List *list);
+G_GNUC_INTERNAL ListNode *list_unlink_head (List *list);
+G_GNUC_INTERNAL ListNode *list_unlink_tail (List *list);
 
-ListNode *list_prepend_node (List *list, ListNode *node);
-ListNode *list_append_node  (List *list, ListNode *node);
+G_GNUC_INTERNAL ListNode *list_prepend_node (List *list, ListNode *node);
+G_GNUC_INTERNAL ListNode *list_append_node  (List *list, ListNode *node);
 
-ListNode *list_node_unlink (ListNode *node);
+G_GNUC_INTERNAL ListNode *list_node_unlink (ListNode *node);
 
 G_END_DECLS
 
diff -up gmime-2.2.10/util/url-scanner.h.accidental-exports gmime-2.2.10/util/url-scanner.h
--- gmime-2.2.10/util/url-scanner.h.accidental-exports	2007-10-12 14:39:28.000000000 -0400
+++ gmime-2.2.10/util/url-scanner.h	2007-10-12 14:39:39.000000000 -0400
@@ -36,12 +36,12 @@ typedef struct {
 typedef gboolean (*GUrlScanFunc) (const char *in, const char *pos, const char *inend, urlmatch_t *match);
 
 /* some default GUrlScanFunc's */
-gboolean g_url_file_start (const char *in, const char *pos, const char *inend, urlmatch_t *match);
-gboolean g_url_file_end (const char *in, const char *pos, const char *inend, urlmatch_t *match);
-gboolean g_url_web_start (const char *in, const char *pos, const char *inend, urlmatch_t *match);
-gboolean g_url_web_end (const char *in, const char *pos, const char *inend, urlmatch_t *match);
-gboolean g_url_addrspec_start (const char *in, const char *pos, const char *inend, urlmatch_t *match);
-gboolean g_url_addrspec_end (const char *in, const char *pos, const char *inend, urlmatch_t *match);
+G_GNUC_INTERNAL gboolean g_url_file_start (const char *in, const char *pos, const char *inend, urlmatch_t *match);
+G_GNUC_INTERNAL gboolean g_url_file_end (const char *in, const char *pos, const char *inend, urlmatch_t *match);
+G_GNUC_INTERNAL gboolean g_url_web_start (const char *in, const char *pos, const char *inend, urlmatch_t *match);
+G_GNUC_INTERNAL gboolean g_url_web_end (const char *in, const char *pos, const char *inend, urlmatch_t *match);
+G_GNUC_INTERNAL gboolean g_url_addrspec_start (const char *in, const char *pos, const char *inend, urlmatch_t *match);
+G_GNUC_INTERNAL gboolean g_url_addrspec_end (const char *in, const char *pos, const char *inend, urlmatch_t *match);
 
 typedef struct {
 	char *pattern;
@@ -52,12 +52,12 @@ typedef struct {
 
 typedef struct _GUrlScanner GUrlScanner;
 
-GUrlScanner *g_url_scanner_new (void);
-void g_url_scanner_free (GUrlScanner *scanner);
+G_GNUC_INTERNAL GUrlScanner *g_url_scanner_new (void);
+G_GNUC_INTERNAL void g_url_scanner_free (GUrlScanner *scanner);
 
-void g_url_scanner_add (GUrlScanner *scanner, urlpattern_t *pattern);
+G_GNUC_INTERNAL void g_url_scanner_add (GUrlScanner *scanner, urlpattern_t *pattern);
 
-gboolean g_url_scanner_scan (GUrlScanner *scanner, const char *in, size_t inlen, urlmatch_t *match);
+G_GNUC_INTERNAL gboolean g_url_scanner_scan (GUrlScanner *scanner, const char *in, size_t inlen, urlmatch_t *match);
 
 G_END_DECLS
 
diff -up gmime-2.2.10/util/cache.h.accidental-exports gmime-2.2.10/util/cache.h
--- gmime-2.2.10/util/cache.h.accidental-exports	2007-10-12 14:39:28.000000000 -0400
+++ gmime-2.2.10/util/cache.h	2007-10-12 14:39:39.000000000 -0400
@@ -52,16 +52,16 @@ struct _Cache {
 };
 
 
-Cache *cache_new (CacheNodeExpireFunc expire, CacheNodeFreeFunc free_node,
+G_GNUC_INTERNAL Cache *cache_new (CacheNodeExpireFunc expire, CacheNodeFreeFunc free_node,
 		  size_t bucket_size, size_t max_cache_size);
 
-void cache_free (Cache *cache);
+G_GNUC_INTERNAL void cache_free (Cache *cache);
 
-CacheNode *cache_node_insert (Cache *cache, const char *key);
-CacheNode *cache_node_lookup (Cache *cache, const char *key, gboolean use);
+G_GNUC_INTERNAL CacheNode *cache_node_insert (Cache *cache, const char *key);
+G_GNUC_INTERNAL CacheNode *cache_node_lookup (Cache *cache, const char *key, gboolean use);
 
-void cache_expire_unused (Cache *cache);
-void cache_node_expire (CacheNode *node);
+G_GNUC_INTERNAL void cache_expire_unused (Cache *cache);
+G_GNUC_INTERNAL void cache_node_expire (CacheNode *node);
 
 G_END_DECLS
 
diff -up gmime-2.2.10/util/gtrie.h.accidental-exports gmime-2.2.10/util/gtrie.h
--- gmime-2.2.10/util/gtrie.h.accidental-exports	2007-10-12 14:39:28.000000000 -0400
+++ gmime-2.2.10/util/gtrie.h	2007-10-12 14:39:39.000000000 -0400
@@ -27,12 +27,12 @@ G_BEGIN_DECLS
 
 typedef struct _GTrie GTrie;
 
-GTrie *g_trie_new (gboolean icase);
-void g_trie_free (GTrie *trie);
+G_GNUC_INTERNAL GTrie *g_trie_new (gboolean icase);
+G_GNUC_INTERNAL void g_trie_free (GTrie *trie);
 
-void g_trie_add (GTrie *trie, const char *pattern, int pattern_id);
+G_GNUC_INTERNAL void g_trie_add (GTrie *trie, const char *pattern, int pattern_id);
 
-const char *g_trie_search (GTrie *trie, const char *buffer, size_t buflen, int *matched_id);
+G_GNUC_INTERNAL const char *g_trie_search (GTrie *trie, const char *buffer, size_t buflen, int *matched_id);
 
 G_END_DECLS
 
diff -up gmime-2.2.10/util/md5-utils.h.accidental-exports gmime-2.2.10/util/md5-utils.h
--- gmime-2.2.10/util/md5-utils.h.accidental-exports	2007-10-12 14:39:28.000000000 -0400
+++ gmime-2.2.10/util/md5-utils.h	2007-10-12 14:39:39.000000000 -0400
@@ -38,16 +38,16 @@ typedef struct {
 } MD5Context;
 
 
-void md5_get_digest (const char *buffer, unsigned int buffer_size, unsigned char digest[16]);
+G_GNUC_INTERNAL void md5_get_digest (const char *buffer, unsigned int buffer_size, unsigned char digest[16]);
 
 /* use this one when speed is needed */
 /* for use in provider code only */
-void md5_get_digest_from_file (const char *filename, unsigned char digest[16]);
+G_GNUC_INTERNAL void md5_get_digest_from_file (const char *filename, unsigned char digest[16]);
 
 /* raw routines */
-void md5_init (MD5Context *ctx);
-void md5_update (MD5Context *ctx, const unsigned char *buf, guint32 len);
-void md5_final (MD5Context *ctx, unsigned char digest[16]);
+G_GNUC_INTERNAL void md5_init (MD5Context *ctx);
+G_GNUC_INTERNAL void md5_update (MD5Context *ctx, const unsigned char *buf, guint32 len);
+G_GNUC_INTERNAL void md5_final (MD5Context *ctx, unsigned char digest[16]);
 
 G_END_DECLS
 
diff -up gmime-2.2.10/util/memchunk.h.accidental-exports gmime-2.2.10/util/memchunk.h
--- gmime-2.2.10/util/memchunk.h.accidental-exports	2007-10-12 14:39:28.000000000 -0400
+++ gmime-2.2.10/util/memchunk.h	2007-10-12 14:39:39.000000000 -0400
@@ -28,19 +28,19 @@ G_BEGIN_DECLS
 
 typedef struct _MemChunk MemChunk;
 
-MemChunk *memchunk_new (size_t atomsize, size_t atomcount, gboolean autoclean);
+G_GNUC_INTERNAL MemChunk *memchunk_new (size_t atomsize, size_t atomcount, gboolean autoclean);
 
-void     *memchunk_alloc (MemChunk *memchunk);
+G_GNUC_INTERNAL void     *memchunk_alloc (MemChunk *memchunk);
 
-void     *memchunk_alloc0 (MemChunk *memchunk);
+G_GNUC_INTERNAL void     *memchunk_alloc0 (MemChunk *memchunk);
 
-void      memchunk_free (MemChunk *memchunk, void *mem);
+G_GNUC_INTERNAL void      memchunk_free (MemChunk *memchunk, void *mem);
 
-void      memchunk_reset (MemChunk *memchunk);
+G_GNUC_INTERNAL void      memchunk_reset (MemChunk *memchunk);
 
-void      memchunk_clean (MemChunk *memchunk);
+G_GNUC_INTERNAL void      memchunk_clean (MemChunk *memchunk);
 
-void      memchunk_destroy (MemChunk *memchunk);
+G_GNUC_INTERNAL void      memchunk_destroy (MemChunk *memchunk);
 
 G_END_DECLS