have our own so we don't need to link with glib.

        * camel-lock-helper.c (g_strerror): have our own so we don't need
        to link with glib.

        * providers/*/Makefile.am: Do not install ANY provider header
        files.  No providers are subclassable.  No providers are directly
        linkable.

        * camel.pc.in: create package config file.

        * tests/lib/folders.c (test_folder_message_ops): updated counts for
        delete also marking unread.

        * tests/lib/camel-test.c (camel_test_provider_init): new api for
        initialising test system 'in-build'.

        * camel-provider.c: remove the assertions, init if we need to,k
        use pthread_once stuff to serialise it.

        * tests/folder/test3.c (main): remove gtk stuff (???).

        * tests/*: Fix all the makefiles.  Made make-check work 'in-build'.

        * tests/lib/folders.c (test_folder_counts): update for api changes.
        (test_message_info): similar.

        * providers/Makefile.am: removed groupwise from the build, this
        can't go in here anymore, not in its current state.

        * camel-net-utils.c (camel_gethostbyaddr_r)
        (camel_gethostbyname_r): the old e_gethost* calls from
        e-host-utils.c.

2004-11-15  Not Zed  <NotZed@Ximian.com>

        * providers/imap/camel-imap-utils.c (imap_path_to_physical):
        copied from e-path.c.
        (imap_path_find_folders): copied from e-path.c.

        * camel.h: remove the provider stuff from the header.

        * camel-provider.c: globalise provider_init variable, and asserton
        it in all functions that rely on it.

        * camel-service.c: removed getaddrinfo/etc.

        * camel-net-utils.[ch]: separate out camel_getaddrinfo etc.

        * Makefile.am: split camel into 2 libraries, libcamel and
        libcamel-store.

        * camel-multipart-signed.c (camel_multipart_signed_sign)
        (camel_multipart_signed_verify, prepare_sign): remove old
        deprecated api.

        * camel-multipart-encrypted.c (camel_multipart_encrypted_encrypt)
        (camel_multipart_encrypted_decrypt): remove old deprecated api.

svn path=/trunk/; revision=28046

41 files changed, 235 insertions, 106 deletions

diff --git a/camel/providers/Makefile.am b/camel/providers/Makefile.am
index 4ae70e9926..0444da4382 100644
--- a/camel/providers/Makefile.am
+++ b/camel/providers/Makefile.am
@@ -12,6 +12,7 @@ if ENABLE_IMAP4
 IMAP4_DIR=imap4
 endif
 
-SUBDIRS = pop3 sendmail smtp imap $(NNTP_DIR) local $(IMAPP_DIR) $(IMAP4_DIR) groupwise
+SUBDIRS = pop3 sendmail smtp imap $(NNTP_DIR) local $(IMAPP_DIR) $(IMAP4_DIR)
+# groupwise
 
 
diff --git a/camel/providers/groupwise/Makefile.am b/camel/providers/groupwise/Makefile.am
index b34f34865d..b15259532c 100644
--- a/camel/providers/groupwise/Makefile.am
+++ b/camel/providers/groupwise/Makefile.am
@@ -5,19 +5,14 @@ libcamelimapincludedir = $(privincludedir)/camel
 camel_provider_LTLIBRARIES = libcamelgroupwise.la
 camel_provider_DATA = libcamelgroupwise.urls
 
-INCLUDES = -I.. \
-	-I$(srcdir)/..					\
+INCLUDES = \
 	-I$(top_srcdir)/camel				\
 	-I$(top_srcdir)/intl				\
-	-I$(top_srcdir)/e-util				\
+	-I$(top_srcdir)/servers/groupwise		\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/camel/providers/imap		\
 	-I$(top_srcdir)/camel/providers/smtp		\
-	$(EVOLUTION_CALENDAR_CFLAGS)                  \
 	$(CAMEL_GROUPWISE_CFLAGS)			\
-	$(GNOME_INCLUDEDIR)				\
-	$(E_UTIL_CFLAGS)				\
-	$(GTK_INCLUDEDIR)				\
 	-DCAMEL_PROVIDERDIR=\"$(camel_providerdir)\"	\
 	-DG_LOG_DOMAIN=\"camel-groupwise-provider\"
 
diff --git a/camel/providers/groupwise/camel-gw-listener.h b/camel/providers/groupwise/camel-gw-listener.h
index 40e7c3d9fc..c4079723f4 100644
--- a/camel/providers/groupwise/camel-gw-listener.h
+++ b/camel/providers/groupwise/camel-gw-listener.h
@@ -26,7 +26,7 @@
 #define CAMEL_GW_LISTENER_H
                                                                                                                              
 
-#include <e-util/e-account-list.h>
+#include <libedataserver/e-account-list.h>
 #include<libedataserver/e-source.h>
 #include<libedataserver/e-source-list.h>
 #include "camel-url.h"
diff --git a/camel/providers/imap/Makefile.am b/camel/providers/imap/Makefile.am
index 1a2f46faf9..7c18acfa7f 100644
--- a/camel/providers/imap/Makefile.am
+++ b/camel/providers/imap/Makefile.am
@@ -1,7 +1,5 @@
 ## Process this file with automake to produce Makefile.in
 
-libcamelimapincludedir = $(privincludedir)/camel
-
 camel_provider_LTLIBRARIES = libcamelimap.la
 camel_provider_DATA = libcamelimap.urls
 
@@ -28,7 +26,7 @@ libcamelimap_la_SOURCES = 			\
 	camel-imap-utils.c			\
 	camel-imap-wrapper.c
 
-libcamelimapinclude_HEADERS =			\
+noinst_HEADERS =			\
 	camel-imap-command.h			\
 	camel-imap-folder.h			\
 	camel-imap-message-cache.h		\
@@ -38,11 +36,9 @@ libcamelimapinclude_HEADERS =			\
 	camel-imap-summary.h			\
 	camel-imap-types.h			\
 	camel-imap-utils.h			\
-	camel-imap-wrapper.h
+	camel-imap-wrapper.h			\
+	camel-imap-private.h
 
 libcamelimap_la_LDFLAGS = -avoid-version -module
 
-noinst_HEADERS =				\
-	camel-imap-private.h
-
 EXTRA_DIST = libcamelimap.urls
diff --git a/camel/providers/imap/camel-imap-folder.c b/camel/providers/imap/camel-imap-folder.c
index 229fbbb82b..6cdd96bcf7 100644
--- a/camel/providers/imap/camel-imap-folder.c
+++ b/camel/providers/imap/camel-imap-folder.c
@@ -37,8 +37,8 @@
 #include <fcntl.h>
 #include <ctype.h>
 
-#include "e-util/e-path.h"
-#include "e-util/e-time-utils.h"
+/*#include "libedataserver/e-path.h"*/
+#include "libedataserver/e-time-utils.h"
 
 #include "camel-imap-folder.h"
 #include "camel-imap-command.h"
@@ -470,7 +470,7 @@ imap_rename (CamelFolder *folder, const char *new)
 	char *folders;
 
 	folders = g_strconcat (imap_store->storage_path, "/folders", NULL);
-	folder_dir = e_path_to_physical (folders, new);
+	folder_dir = imap_path_to_physical (folders, new);
 	g_free (folders);
 	summary_path = g_strdup_printf("%s/summary", folder_dir);
 
diff --git a/camel/providers/imap/camel-imap-private.h b/camel/providers/imap/camel-imap-private.h
index 0f80dbfd1c..d07358527a 100644
--- a/camel/providers/imap/camel-imap-private.h
+++ b/camel/providers/imap/camel-imap-private.h
@@ -36,7 +36,7 @@ extern "C" {
 #endif
 
 #ifdef ENABLE_THREADS
-#include "e-util/e-msgport.h"
+#include "libedataserver/e-msgport.h"
 #endif
 
 struct _CamelImapFolderPrivate {
diff --git a/camel/providers/imap/camel-imap-search.c b/camel/providers/imap/camel-imap-search.c
index eacb839cb2..2c0dcb02f6 100644
--- a/camel/providers/imap/camel-imap-search.c
+++ b/camel/providers/imap/camel-imap-search.c
@@ -38,7 +38,7 @@
 #include "camel-imap-utils.h"
 #include "camel-imap-summary.h"
 
-#include "e-util/md5-utils.h"	/* md5 hash building */
+#include "libedataserver/md5-utils.h"	/* md5 hash building */
 #include "camel-mime-utils.h"	/* base64 encoding */
 
 #include "camel-seekable-stream.h"
diff --git a/camel/providers/imap/camel-imap-search.h b/camel/providers/imap/camel-imap-search.h
index 7664c4c2ed..3ad7f8decc 100644
--- a/camel/providers/imap/camel-imap-search.h
+++ b/camel/providers/imap/camel-imap-search.h
@@ -27,7 +27,7 @@
 #define _CAMEL_IMAP_SEARCH_H
 
 #include <camel/camel-folder-search.h>
-#include <e-util/e-msgport.h>
+#include <libedataserver/e-msgport.h>
 #include <camel/camel-data-cache.h>
 
 #define CAMEL_IMAP_SEARCH_TYPE         (camel_imap_search_get_type ())
diff --git a/camel/providers/imap/camel-imap-store-summary.c b/camel/providers/imap/camel-imap-store-summary.c
index 32530d3c3f..434f5b5da0 100644
--- a/camel/providers/imap/camel-imap-store-summary.c
+++ b/camel/providers/imap/camel-imap-store-summary.c
@@ -33,8 +33,8 @@
 
 #include "camel-file-utils.h"
 
-#include "e-util/md5-utils.h"
-#include "e-util/e-memory.h"
+#include "libedataserver/md5-utils.h"
+#include "libedataserver/e-memory.h"
 
 #include "camel-private.h"
 #include "camel-utf8.h"
diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c
index 52e0dfba89..5811b0f691 100644
--- a/camel/providers/imap/camel-imap-store.c
+++ b/camel/providers/imap/camel-imap-store.c
@@ -34,8 +34,6 @@
 #include <unistd.h>
 #include <errno.h>
 
-#include "e-util/e-path.h"
-
 #include "camel-imap-store.h"
 #include "camel-imap-store-summary.h"
 #include "camel-imap-folder.h"
@@ -62,6 +60,7 @@
 #include "camel-private.h"
 #include "camel-debug.h"
 #include "camel-i18n.h"
+#include "camel-net-utils.h"
 
 #define d(x) 
 
@@ -1042,7 +1041,7 @@ imap_forget_folder (CamelImapStore *imap_store, const char *folder_name, CamelEx
 		name = folder_name;
 	
 	storage_path = g_strdup_printf ("%s/folders", imap_store->storage_path);
-	folder_dir = e_path_to_physical (storage_path, folder_name);
+	folder_dir = imap_path_to_physical (storage_path, folder_name);
 	g_free (storage_path);
 	if (access (folder_dir, F_OK) != 0) {
 		g_free (folder_dir);
@@ -1983,7 +1982,7 @@ get_folder_online (CamelStore *store, const char *folder_name, guint32 flags, Ca
 	}
 
 	storage_path = g_strdup_printf("%s/folders", imap_store->storage_path);
-	folder_dir = e_path_to_physical (storage_path, folder_name);
+	folder_dir = imap_path_to_physical (storage_path, folder_name);
 	g_free(storage_path);
 	new_folder = camel_imap_folder_new (store, folder_name, folder_dir, ex);
 	g_free (folder_dir);
@@ -2026,7 +2025,7 @@ get_folder_offline (CamelStore *store, const char *folder_name,
 		folder_name = "INBOX";
 	
 	storage_path = g_strdup_printf("%s/folders", imap_store->storage_path);
-	folder_dir = e_path_to_physical (storage_path, folder_name);
+	folder_dir = imap_path_to_physical (storage_path, folder_name);
 	g_free(storage_path);
 	if (!folder_dir || access (folder_dir, F_OK) != 0) {
 		g_free (folder_dir);
@@ -2196,8 +2195,8 @@ rename_folder (CamelStore *store, const char *old_name, const char *new_name_in,
 		manage_subscriptions(store, new_name_in, TRUE);
 
 	storage_path = g_strdup_printf("%s/folders", imap_store->storage_path);
-	oldpath = e_path_to_physical (storage_path, old_name);
-	newpath = e_path_to_physical (storage_path, new_name_in);
+	oldpath = imap_path_to_physical (storage_path, old_name);
+	newpath = imap_path_to_physical (storage_path, new_name_in);
 	g_free(storage_path);
 
 	/* So do we care if this didn't work?  Its just a cache? */
@@ -2632,7 +2631,7 @@ fill_fi(CamelStore *store, CamelFolderInfo *fi, guint32 flags)
 
 		/* This is a lot of work for one path! */
 		storage_path = g_strdup_printf("%s/folders", ((CamelImapStore *)store)->storage_path);
-		folder_dir = e_path_to_physical(storage_path, fi->full_name);
+		folder_dir = imap_path_to_physical(storage_path, fi->full_name);
 		path = g_strdup_printf("%s/summary", folder_dir);
 		s = (CamelFolderSummary *)camel_object_new(camel_imap_summary_get_type());
 		camel_folder_summary_set_build_content(s, TRUE);
@@ -3038,7 +3037,7 @@ get_folder_info_offline (CamelStore *store, const char *top,
 	/* A kludge to avoid having to pass a struct to the callback */
 	g_ptr_array_add (folders, imap_store);
 	storage_path = g_strdup_printf("%s/folders", imap_store->storage_path);
-	if (!e_path_find_folders (storage_path, get_one_folder_offline, folders)) {
+	if (!imap_path_find_folders (storage_path, get_one_folder_offline, folders)) {
 		camel_disco_store_check_online (CAMEL_DISCO_STORE (imap_store), ex);
 		fi = NULL;
 	} else {
diff --git a/camel/providers/imap/camel-imap-store.h b/camel/providers/imap/camel-imap-store.h
index b197cadda4..b1e3226969 100644
--- a/camel/providers/imap/camel-imap-store.h
+++ b/camel/providers/imap/camel-imap-store.h
@@ -35,7 +35,7 @@ extern "C" {
 #include <camel/camel-disco-store.h>
 
 #ifdef ENABLE_THREADS
-#include <e-util/e-msgport.h>
+#include <libedataserver/e-msgport.h>
 
 typedef struct _CamelImapMsg CamelImapMsg;
 
diff --git a/camel/providers/imap/camel-imap-utils.c b/camel/providers/imap/camel-imap-utils.c
index a557f7fcae..06028ef79d 100644
--- a/camel/providers/imap/camel-imap-utils.c
+++ b/camel/providers/imap/camel-imap-utils.c
@@ -30,6 +30,10 @@
 #include <string.h>
 #include <time.h>
 #include <errno.h>
+#include <sys/types.h>
+#include <dirent.h>
+#include <sys/stat.h>
+#include <unistd.h>
 
 #include "camel-imap-utils.h"
 #include "camel-imap-summary.h"
@@ -40,6 +44,9 @@
 
 #define d(x)
 
+#define SUBFOLDER_DIR_NAME     "subfolders"
+#define SUBFOLDER_DIR_NAME_LEN 10
+
 const char *
 imap_next_word (const char *buf)
 {
@@ -1263,3 +1270,160 @@ imap_mailbox_decode (const unsigned char *in, size_t inlen)
 	
 	return camel_utf7_utf8 (buf);
 }
+
+char *
+imap_path_to_physical (const char *prefix, const char *vpath)
+{
+	const char *p, *newp;
+	char *dp;
+	char *ppath;
+	int ppath_len;
+	int prefix_len;
+
+	while (*vpath == '/')
+		vpath++;
+	if (!prefix)
+		prefix = "";
+
+	/* Calculate the length of the real path. */
+	ppath_len = strlen (vpath);
+	ppath_len++;	/* For the ending zero.  */
+
+	prefix_len = strlen (prefix);
+	ppath_len += prefix_len;
+	ppath_len++;	/* For the separating slash.  */
+
+	/* Take account of the fact that we need to translate every
+	 * separator into `subfolders/'.
+	 */
+	p = vpath;
+	while (1) {
+		newp = strchr (p, '/');
+		if (newp == NULL)
+			break;
+
+		ppath_len += SUBFOLDER_DIR_NAME_LEN;
+		ppath_len++; /* For the separating slash.  */
+
+		/* Skip consecutive slashes.  */
+		while (*newp == '/')
+			newp++;
+
+		p = newp;
+	};
+
+	ppath = g_malloc (ppath_len);
+	dp = ppath;
+
+	memcpy (dp, prefix, prefix_len);
+	dp += prefix_len;
+	*(dp++) = '/';
+
+	/* Copy the mangled path.  */
+	p = vpath;
+ 	while (1) {
+		newp = strchr (p, '/');
+		if (newp == NULL) {
+			strcpy (dp, p);
+			break;
+		}
+
+		memcpy (dp, p, newp - p + 1); /* `+ 1' to copy the slash too.  */
+		dp += newp - p + 1;
+
+		memcpy (dp, SUBFOLDER_DIR_NAME, SUBFOLDER_DIR_NAME_LEN);
+		dp += SUBFOLDER_DIR_NAME_LEN;
+
+		*(dp++) = '/';
+
+		/* Skip consecutive slashes.  */
+		while (*newp == '/')
+			newp++;
+
+		p = newp;
+	}
+
+	return ppath;
+}
+
+static gboolean
+find_folders_recursive (const char *physical_path, const char *path,
+			IMAPPathFindFoldersCallback callback, gpointer data)
+{
+	DIR *dir;
+	char *subfolder_directory_path;
+	gboolean ok;
+
+	if (*path) {
+		if (!callback (physical_path, path, data))
+			return FALSE;
+
+		subfolder_directory_path = g_strdup_printf ("%s/%s", physical_path, SUBFOLDER_DIR_NAME);
+	} else {
+		/* On the top level, we have no folders and,
+		 * consequently, no subfolder directory.
+		 */
+
+		subfolder_directory_path = g_strdup (physical_path);
+	}
+
+	/* Now scan the subfolders and load them. */
+	dir = opendir (subfolder_directory_path);
+	if (dir == NULL) {
+		g_free (subfolder_directory_path);
+		return TRUE;
+	}
+
+	ok = TRUE;
+	while (ok) {
+		struct stat file_stat;
+		struct dirent *dirent;
+		char *file_path;
+		char *new_path;
+
+		dirent = readdir (dir);
+		if (dirent == NULL)
+			break;
+
+		if (strcmp (dirent->d_name, ".") == 0 || strcmp (dirent->d_name, "..") == 0)
+			continue;
+
+		file_path = g_strdup_printf ("%s/%s", subfolder_directory_path,
+					     dirent->d_name);
+
+		if (stat (file_path, &file_stat) < 0 ||
+		    ! S_ISDIR (file_stat.st_mode)) {
+			g_free (file_path);
+			continue;
+		}
+
+		new_path = g_strdup_printf ("%s/%s", path, dirent->d_name);
+
+		ok = find_folders_recursive (file_path, new_path, callback, data);
+
+		g_free (file_path);
+		g_free (new_path);
+	}
+
+	closedir (dir);
+	g_free (subfolder_directory_path);
+
+	return ok;
+}
+
+/**
+ * imap_path_find_folders:
+ * @prefix: directory to start from
+ * @callback: Callback to invoke on each folder
+ * @data: Data for @callback
+ *
+ * Walks the folder tree starting at @prefix and calls @callback
+ * on each folder.
+ *
+ * Return value: %TRUE on success, %FALSE if an error occurs at any point
+ **/
+gboolean
+imap_path_find_folders (const char *prefix, IMAPPathFindFoldersCallback callback, gpointer data)
+{
+	return find_folders_recursive (prefix, "", callback, data);
+}
diff --git a/camel/providers/imap/camel-imap-utils.h b/camel/providers/imap/camel-imap-utils.h
index e8f570137f..7278843a6b 100644
--- a/camel/providers/imap/camel-imap-utils.h
+++ b/camel/providers/imap/camel-imap-utils.h
@@ -88,6 +88,11 @@ char *imap_namespace_concat (CamelImapStore *store, const char *name);
 char *imap_mailbox_encode (const unsigned char *in, size_t inlen);
 char *imap_mailbox_decode (const unsigned char *in, size_t inlen);
 
+typedef gboolean (*IMAPPathFindFoldersCallback) (const char *physical_path, const char *path, gpointer user_data);
+
+char *imap_path_to_physical (const char *prefix, const char *vpath);
+gboolean imap_path_find_folders (const char *prefix, IMAPPathFindFoldersCallback callback, gpointer data);
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
diff --git a/camel/providers/imap4/Makefile.am b/camel/providers/imap4/Makefile.am
index 259b71fe74..3cdf897f6a 100644
--- a/camel/providers/imap4/Makefile.am
+++ b/camel/providers/imap4/Makefile.am
@@ -1,7 +1,5 @@
 ## Process this file with automake to produce Makefile.in
 
-libcamelimap4includedir = $(privincludedir)/camel
-
 camel_provider_LTLIBRARIES = libcamelimap4.la
 camel_provider_DATA = libcamelimap4.urls
 
diff --git a/camel/providers/imap4/camel-imap4-command.h b/camel/providers/imap4/camel-imap4-command.h
index 49487b1b2d..112695a0db 100644
--- a/camel/providers/imap4/camel-imap4-command.h
+++ b/camel/providers/imap4/camel-imap4-command.h
@@ -25,7 +25,7 @@
 
 #include <glib.h>
 
-#include <e-util/e-msgport.h>
+#include <libedataserver/e-msgport.h>
 
 #include <camel/camel-stream.h>
 #include <camel/camel-exception.h>
diff --git a/camel/providers/imap4/camel-imap4-engine.h b/camel/providers/imap4/camel-imap4-engine.h
index 6bc76f9693..b4d8df2e8d 100644
--- a/camel/providers/imap4/camel-imap4-engine.h
+++ b/camel/providers/imap4/camel-imap4-engine.h
@@ -25,7 +25,7 @@
 
 #include <glib.h>
 
-#include <e-util/e-msgport.h>
+#include <libedataserver/e-msgport.h>
 
 #include <camel/camel-stream.h>
 #include <camel/camel-folder.h>
diff --git a/camel/providers/imap4/camel-imap4-store.c b/camel/providers/imap4/camel-imap4-store.c
index ec24c59235..2e7308d75d 100644
--- a/camel/providers/imap4/camel-imap4-store.c
+++ b/camel/providers/imap4/camel-imap4-store.c
@@ -35,6 +35,7 @@
 #include <camel/camel-private.h>
 
 #include <camel/camel-i18n.h>
+#include <camel/camel-net-utils.h>
 
 #include "camel-imap4-store.h"
 #include "camel-imap4-engine.h"
diff --git a/camel/providers/imap4/camel-imap4-summary.c b/camel/providers/imap4/camel-imap4-summary.c
index 00bb8ceed2..e38928ef43 100644
--- a/camel/providers/imap4/camel-imap4-summary.c
+++ b/camel/providers/imap4/camel-imap4-summary.c
@@ -33,7 +33,7 @@
 #include <ctype.h>
 #include <errno.h>
 
-#include <e-util/md5-utils.h>
+#include <libedataserver/md5-utils.h>
 
 #include <camel/camel-file-utils.h>
 #include <camel/camel-string-utils.h>
diff --git a/camel/providers/imap4/camel-imap4-utils.c b/camel/providers/imap4/camel-imap4-utils.c
index 7cf476533e..8a0e92f502 100644
--- a/camel/providers/imap4/camel-imap4-utils.c
+++ b/camel/providers/imap4/camel-imap4-utils.c
@@ -29,6 +29,7 @@
 
 #include <camel/camel-store.h>
 #include <camel/camel-i18n.h>
+#include <camel/camel-net-utils.h>
 
 #include "camel-imap4-engine.h"
 #include "camel-imap4-stream.h"
diff --git a/camel/providers/imapp/Makefile.am b/camel/providers/imapp/Makefile.am
index 7ce8c65fcd..8260c58670 100644
--- a/camel/providers/imapp/Makefile.am
+++ b/camel/providers/imapp/Makefile.am
@@ -1,7 +1,5 @@
 ## Process this file with automake to produce Makefile.in
 
-libcamelimappincludedir = $(privincludedir)/camel
-
 camel_provider_LTLIBRARIES = libcamelimapp.la
 camel_provider_DATA = libcamelimapp.urls
 
@@ -27,7 +25,7 @@ libcamelimapp_la_SOURCES =			\
 	camel-imapp-driver.c			\
 	camel-imapp-summary.c
 
-libcamelimappinclude_HEADERS =			\
+noinst_HEADERS =			\
 	camel-imapp-utils.h			\
 	camel-imapp-engine.h			\
 	camel-imapp-stream.h			\
@@ -39,7 +37,4 @@ libcamelimappinclude_HEADERS =			\
 
 libcamelimapp_la_LDFLAGS = -avoid-version -module
 
-#noinst_HEADERS =				\
-#	camel-imap-private.h
-
 EXTRA_DIST = libcamelimapp.urls
diff --git a/camel/providers/imapp/camel-imapp-driver.h b/camel/providers/imapp/camel-imapp-driver.h
index c336dd3d2a..2ecdfe634b 100644
--- a/camel/providers/imapp/camel-imapp-driver.h
+++ b/camel/providers/imapp/camel-imapp-driver.h
@@ -4,7 +4,7 @@
 
 #include <camel/camel-object.h>
 #include "camel-imapp-stream.h"
-#include <e-util/e-msgport.h>
+#include <libedataserver/e-msgport.h>
 
 #define CAMEL_IMAPP_DRIVER_TYPE     (camel_imapp_driver_get_type ())
 #define CAMEL_IMAPP_DRIVER(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_IMAPP_DRIVER_TYPE, CamelIMAPPDriver))
diff --git a/camel/providers/imapp/camel-imapp-engine.h b/camel/providers/imapp/camel-imapp-engine.h
index 4064d9957d..2cc19cd21f 100644
--- a/camel/providers/imapp/camel-imapp-engine.h
+++ b/camel/providers/imapp/camel-imapp-engine.h
@@ -5,7 +5,7 @@
 #include <camel/camel-object.h>
 
 #include "camel-imapp-stream.h"
-#include <e-util/e-msgport.h>
+#include <libedataserver/e-msgport.h>
 #include "camel-imapp-folder.h"
 
 #define CAMEL_IMAPP_ENGINE_TYPE     (camel_imapp_engine_get_type ())
diff --git a/camel/providers/imapp/camel-imapp-folder.c b/camel/providers/imapp/camel-imapp-folder.c
index e85048d92c..a838e7c6e4 100644
--- a/camel/providers/imapp/camel-imapp-folder.c
+++ b/camel/providers/imapp/camel-imapp-folder.c
@@ -41,7 +41,7 @@
 #include "camel-imapp-summary.h"
 #include "camel-imapp-exception.h"
 
-#include <e-util/md5-utils.h>
+#include <libedataserver/md5-utils.h>
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/camel/providers/imapp/camel-imapp-store-summary.c b/camel/providers/imapp/camel-imapp-store-summary.c
index a3ad57fb11..0c8d617d1a 100644
--- a/camel/providers/imapp/camel-imapp-store-summary.c
+++ b/camel/providers/imapp/camel-imapp-store-summary.c
@@ -33,8 +33,8 @@
 #include "camel/camel-file-utils.h"
 
 #include "camel-string-utils.h"
-#include "e-util/md5-utils.h"
-#include "e-util/e-memory.h"
+#include "libedataserver/md5-utils.h"
+#include "libedataserver/e-memory.h"
 
 #include "camel-private.h"
 #include "camel-utf8.h"
diff --git a/camel/providers/imapp/camel-imapp-store.c b/camel/providers/imapp/camel-imapp-store.c
index 60d2816096..03f835da7a 100644
--- a/camel/providers/imapp/camel-imapp-store.c
+++ b/camel/providers/imapp/camel-imapp-store.c
@@ -57,6 +57,7 @@
 #include "camel-imapp-exception.h"
 #include "camel-imapp-utils.h"
 #include "camel-imapp-driver.h"
+#include "camel-net-utils.h"
 
 /* Specified in RFC 2060 section 2.1 */
 #define IMAP_PORT 143
diff --git a/camel/providers/imapp/camel-imapp-store.h b/camel/providers/imapp/camel-imapp-store.h
index ace5288986..c26be59baf 100644
--- a/camel/providers/imapp/camel-imapp-store.h
+++ b/camel/providers/imapp/camel-imapp-store.h
@@ -33,7 +33,7 @@ extern "C" {
 #include <camel/camel-types.h>
 #include <camel/camel-store.h>
 #include "camel-imapp-driver.h"
-#include "e-util/e-memory.h"
+#include "libedataserver/e-memory.h"
 
 #define CAMEL_IMAPP_STORE_TYPE     (camel_imapp_store_get_type ())
 #define CAMEL_IMAPP_STORE(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_IMAPP_STORE_TYPE, CamelIMAPPStore))
diff --git a/camel/providers/imapp/camel-imapp-utils.c b/camel/providers/imapp/camel-imapp-utils.c
index 51e0fe19b0..1460157848 100644
--- a/camel/providers/imapp/camel-imapp-utils.c
+++ b/camel/providers/imapp/camel-imapp-utils.c
@@ -13,7 +13,7 @@
 #include "camel-imapp-utils.h"
 #include "camel-imapp-exception.h"
 #include "camel-imapp-engine.h"
-#include "e-util/e-memory.h"
+#include "libedataserver/e-memory.h"
 
 /* high-level parser state */
 #define p(x)
diff --git a/camel/providers/local/Makefile.am b/camel/providers/local/Makefile.am
index ad07472e85..fbf3199a8b 100644
--- a/camel/providers/local/Makefile.am
+++ b/camel/providers/local/Makefile.am
@@ -1,19 +1,13 @@
 ## Process this file with automake to produce Makefile.in
 
-libcamellocalincludedir = $(privincludedir)/camel
-
 camel_provider_LTLIBRARIES = libcamellocal.la
 camel_provider_DATA = libcamellocal.urls
 
-INCLUDES = -I.. \
-	-I$(srcdir)/..				\
+INCLUDES = \
 	-I$(top_srcdir)/camel			\
 	-I$(top_srcdir)/intl			\
-	-I$(top_srcdir)/e-util			\
 	-I$(top_srcdir)				\
 	$(CAMEL_CFLAGS)				\
-	$(GNOME_INCLUDEDIR)			\
-	$(GTK_INCLUDEDIR)			\
 	-DG_LOG_DOMAIN=\"camel-local-provider\"
 
 libcamellocal_la_SOURCES = 			\
@@ -34,7 +28,7 @@ libcamellocal_la_SOURCES = 			\
 	camel-spool-store.c			\
 	camel-spool-summary.c
 
-libcamellocalinclude_HEADERS =			\
+noinst_HEADERS =				\
 	camel-local-folder.h			\
 	camel-local-store.h			\
 	camel-local-summary.h			\
@@ -49,13 +43,12 @@ libcamellocalinclude_HEADERS =			\
 	camel-maildir-summary.h			\
 	camel-spool-folder.h			\
 	camel-spool-store.h			\
-	camel-spool-summary.h
-
-noinst_HEADERS =				\
+	camel-spool-summary.h			\
 	camel-local-private.h
 
 libcamellocal_la_LDFLAGS = -avoid-version -module
 
-libcamellocal_la_LIBADD = $(top_builddir)/e-util/libeutil.la
+libcamellocal_la_LIBADD = \
+	$(top_builddir)/libedataserver/libedataserver-${BASE_VERSION}.la
 
 EXTRA_DIST = libcamellocal.urls
diff --git a/camel/providers/local/camel-maildir-summary.c b/camel/providers/local/camel-maildir-summary.c
index 07183d2cb4..95b8bdc8c8 100644
--- a/camel/providers/local/camel-maildir-summary.c
+++ b/camel/providers/local/camel-maildir-summary.c
@@ -41,7 +41,7 @@
 #include <camel/camel-operation.h>
 
 #include "camel-private.h"
-#include "e-util/e-memory.h"
+#include "libedataserver/e-memory.h"
 #include "camel-i18n.h"
 
 #define d(x) /*(printf("%s(%d): ", __FILE__, __LINE__),(x))*/
diff --git a/camel/providers/nntp/Makefile.am b/camel/providers/nntp/Makefile.am
index 99c3fe03b7..bc8b82ccad 100644
--- a/camel/providers/nntp/Makefile.am
+++ b/camel/providers/nntp/Makefile.am
@@ -1,7 +1,5 @@
 ## Process this file with automake to produce Makefile.in
 
-libcamelnntpincludedir = $(privincludedir)/camel
-
 camel_provider_LTLIBRARIES = libcamelnntp.la
 camel_provider_DATA = libcamelnntp.urls
 
@@ -24,15 +22,13 @@ libcamelnntp_la_SOURCES = 			\
 	camel-nntp-summary.c			\
 	camel-nntp-store-summary.c
 
-libcamelnntpinclude_HEADERS =			\
+noinst_HEADERS =			\
 	camel-nntp-store.h			\
 	camel-nntp-folder.h			\
 	camel-nntp-resp-codes.h			\
 	camel-nntp-stream.h			\
 	camel-nntp-summary.h			\
-	camel-nntp-store-summary.h
-
-noinst_HEADERS =				\
+	camel-nntp-store-summary.h		\
 	camel-nntp-private.h
 
 libcamelnntp_la_LDFLAGS = -avoid-version -module
diff --git a/camel/providers/nntp/camel-nntp-private.h b/camel/providers/nntp/camel-nntp-private.h
index 253d4e2031..520c9db134 100644
--- a/camel/providers/nntp/camel-nntp-private.h
+++ b/camel/providers/nntp/camel-nntp-private.h
@@ -35,7 +35,7 @@ extern "C" {
 #include <config.h>
 #endif
 
-#include "e-util/e-msgport.h"
+#include "libedataserver/e-msgport.h"
 
 struct _CamelNNTPStorePrivate {
 	int dummy;
diff --git a/camel/providers/nntp/camel-nntp-store-summary.c b/camel/providers/nntp/camel-nntp-store-summary.c
index 7dbcd89118..4c7e3df1aa 100644
--- a/camel/providers/nntp/camel-nntp-store-summary.c
+++ b/camel/providers/nntp/camel-nntp-store-summary.c
@@ -33,8 +33,8 @@
 
 #include "camel-file-utils.h"
 
-#include "e-util/md5-utils.h"
-#include "e-util/e-memory.h"
+#include "libedataserver/md5-utils.h"
+#include "libedataserver/e-memory.h"
 
 #include "camel-private.h"
 #include "camel-utf8.h"
diff --git a/camel/providers/nntp/camel-nntp-store.c b/camel/providers/nntp/camel-nntp-store.c
index 2427d9577a..f9daad8515 100644
--- a/camel/providers/nntp/camel-nntp-store.c
+++ b/camel/providers/nntp/camel-nntp-store.c
@@ -54,6 +54,7 @@
 #include "camel-nntp-private.h"
 #include "camel-nntp-resp-codes.h"
 #include "camel-i18n.h"
+#include "camel-net-utils.h"
 
 #define w(x)
 #define dd(x) (camel_debug("nntp")?(x):0)
diff --git a/camel/providers/nntp/camel-nntp-utils.c b/camel/providers/nntp/camel-nntp-utils.c
index d8000a85ee..43cbb0eedb 100644
--- a/camel/providers/nntp/camel-nntp-utils.c
+++ b/camel/providers/nntp/camel-nntp-utils.c
@@ -29,7 +29,7 @@
 #include "camel-stream-mem.h"
 #include "camel-exception.h"
 
-#include "e-util/md5-utils.h"
+#include "libedataserver/md5-utils.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/camel/providers/pop3/Makefile.am b/camel/providers/pop3/Makefile.am
index 84f5477f97..49df41e230 100644
--- a/camel/providers/pop3/Makefile.am
+++ b/camel/providers/pop3/Makefile.am
@@ -1,20 +1,13 @@
 ## Process this file with automake to produce Makefile.in
 
-libcamelpop3includedir = $(privincludedir)/camel
-
 camel_provider_LTLIBRARIES = libcamelpop3.la
 camel_provider_DATA = libcamelpop3.urls
 
 INCLUDES =					\
-	-I..					\
-	-I$(srcdir)/..				\
-	-I$(srcdir)/../../..			\
+	-I$(top_srcdir)				\
 	-I$(top_srcdir)/intl			\
 	-I$(top_srcdir)/camel			\
-	-I$(top_srcdir)/e-util			\
 	$(CAMEL_CFLAGS)				\
-	$(GNOME_INCLUDEDIR)			\
-	$(GTK_INCLUDEDIR)			\
 	-DG_LOG_DOMAIN=\"camel-pop3-provider\"
 
 libcamelpop3_la_SOURCES = 			\
@@ -24,15 +17,15 @@ libcamelpop3_la_SOURCES = 			\
 	camel-pop3-stream.c			\
 	camel-pop3-store.c
 
-libcamelpop3include_HEADERS =			\
+noinst_HEADERS =			\
 	camel-pop3-engine.h			\
 	camel-pop3-folder.h			\
 	camel-pop3-stream.h			\
 	camel-pop3-store.h
 
-
 libcamelpop3_la_LDFLAGS = -avoid-version -module
 
-libcamelpop3_la_LIBADD = $(top_builddir)/e-util/libeutil.la
+libcamelpop3_la_LIBADD = \
+	$(top_builddir)/libedataserver/libedataserver-${BASE_VERSION}.la
 
 EXTRA_DIST = libcamelpop3.urls
diff --git a/camel/providers/pop3/camel-pop3-engine.h b/camel/providers/pop3/camel-pop3-engine.h
index 3114980311..48938bbf48 100644
--- a/camel/providers/pop3/camel-pop3-engine.h
+++ b/camel/providers/pop3/camel-pop3-engine.h
@@ -22,7 +22,7 @@
 #define _CAMEL_POP3_ENGINE_H
 
 #include <camel/camel-object.h>
-#include "e-util/e-msgport.h"
+#include "libedataserver/e-msgport.h"
 #include "camel-pop3-stream.h"
 
 #define CAMEL_POP3_ENGINE(obj)         CAMEL_CHECK_CAST (obj, camel_pop3_engine_get_type (), CamelPOP3Engine)
diff --git a/camel/providers/pop3/camel-pop3-folder.c b/camel/providers/pop3/camel-pop3-folder.c
index 23a5bc7d88..e0d91f1eff 100644
--- a/camel/providers/pop3/camel-pop3-folder.c
+++ b/camel/providers/pop3/camel-pop3-folder.c
@@ -39,7 +39,7 @@
 #include "camel-data-cache.h"
 #include "camel-i18n.h"
 
-#include <e-util/md5-utils.h>
+#include <libedataserver/md5-utils.h>
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/camel/providers/pop3/camel-pop3-store.c b/camel/providers/pop3/camel-pop3-store.c
index b9f07ec0e8..46a1fd3fe6 100644
--- a/camel/providers/pop3/camel-pop3-store.c
+++ b/camel/providers/pop3/camel-pop3-store.c
@@ -45,7 +45,7 @@
 #include "camel-session.h"
 #include "camel-exception.h"
 #include "camel-url.h"
-#include "e-util/md5-utils.h"
+#include "libedataserver/md5-utils.h"
 #include "camel-pop3-engine.h"
 #include "camel-sasl.h"
 #include "camel-data-cache.h"
@@ -55,6 +55,7 @@
 #include "camel-tcp-stream-ssl.h"
 #endif
 #include "camel-i18n.h"
+#include "camel-net-utils.h"
 
 /* Specified in RFC 1939 */
 #define POP3_PORT "110"
diff --git a/camel/providers/sendmail/Makefile.am b/camel/providers/sendmail/Makefile.am
index 8c75af2de8..46e3613081 100644
--- a/camel/providers/sendmail/Makefile.am
+++ b/camel/providers/sendmail/Makefile.am
@@ -1,7 +1,5 @@
 ## Process this file with automake to produce Makefile.in
 
-libcamelsendmailincludedir = $(privincludedir)/camel
-
 camel_provider_LTLIBRARIES = libcamelsendmail.la
 camel_provider_DATA = libcamelsendmail.urls
 
@@ -20,7 +18,7 @@ libcamelsendmail_la_SOURCES = 			\
 	camel-sendmail-provider.c		\
 	camel-sendmail-transport.c
 
-libcamelsendmailinclude_HEADERS =		\
+noinst_HEADERS =		\
 	camel-sendmail-transport.h
 
 libcamelsendmail_la_LDFLAGS = -avoid-version -module
diff --git a/camel/providers/smtp/Makefile.am b/camel/providers/smtp/Makefile.am
index b6bba766d6..29dc3dc44d 100644
--- a/camel/providers/smtp/Makefile.am
+++ b/camel/providers/smtp/Makefile.am
@@ -1,35 +1,25 @@
 ## Process this file with automake to produce Makefile.in
 
-libcamelsmtpincludedir = $(privincludedir)/camel
-
 camel_provider_LTLIBRARIES = libcamelsmtp.la
 camel_provider_DATA = libcamelsmtp.urls
 
 INCLUDES =					\
-	-I..					\
-	-I$(srcdir)/..				\
-	-I$(srcdir)/../../..			\
+	-I$(top_srcdir)				\
 	-I$(top_srcdir)/intl			\
 	-I$(top_srcdir)/camel			\
-	-I$(top_srcdir)/e-util			\
 	$(CAMEL_CFLAGS)				\
-	$(GNOME_INCLUDEDIR)			\
-	$(GTK_INCLUDEDIR)			\
-	$(NSPR_CFLAGS)				\
-	$(NSS_CFLAGS)				\
-	$(OPENSSL_CFLAGS)			\
 	-DG_LOG_DOMAIN=\"camel-smtp-provider\"
 
 libcamelsmtp_la_SOURCES = 			\
 	camel-smtp-provider.c			\
 	camel-smtp-transport.c
 
-libcamelsmtpinclude_HEADERS =			\
+noinst_HEADERS =			\
 	camel-smtp-transport.h
 
-
 libcamelsmtp_la_LDFLAGS = -avoid-version -module
 
-libcamelsmtp_la_LIBADD = $(top_builddir)/e-util/libeutil.la
+libcamelsmtp_la_LIBADD = \
+	$(top_builddir)/libedataserver/libedataserver-${BASE_VERSION}.la
 
 EXTRA_DIST = libcamelsmtp.urls
diff --git a/camel/providers/smtp/camel-smtp-transport.c b/camel/providers/smtp/camel-smtp-transport.c
index 542f8c6b72..065d79fdac 100644
--- a/camel/providers/smtp/camel-smtp-transport.c
+++ b/camel/providers/smtp/camel-smtp-transport.c
@@ -56,6 +56,7 @@
 #include "camel-exception.h"
 #include "camel-sasl.h"
 #include "camel-i18n.h"
+#include "camel-net-utils.h"
 
 extern int camel_verbose_debug;
 #define d(x) (camel_verbose_debug ? (x) : 0)