4 files changed, 9 insertions, 14 deletions
diff --git a/camel/providers/imap/camel-imap-folder.c b/camel/providers/imap/camel-imap-folder.c
index f30c731e0c..9f325aae56 100644
--- a/camel/providers/imap/camel-imap-folder.c
+++ b/camel/providers/imap/camel-imap-folder.c
@@ -36,8 +36,6 @@
 #include <fcntl.h>
 #include <ctype.h>
 
-#include <gal/util/e-util.h>
-
 #include "camel-imap-folder.h"
 #include "camel-imap-command.h"
 #include "camel-imap-message-cache.h"
diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c
index 214b9fe18b..d7aec42f2c 100644
--- a/camel/providers/imap/camel-imap-store.c
+++ b/camel/providers/imap/camel-imap-store.c
@@ -32,7 +32,6 @@
 #include <unistd.h>
 #include <errno.h>
 
-#include <gal/util/e-util.h>
 #include "e-util/e-path.h"
 
 #include "camel-imap-store.h"
@@ -580,11 +579,11 @@ imap_store_setup_online (CamelImapStore *store, CamelException *ex)
 		result = camel_imap_response_extract (response, "NAMESPACE", ex);
 		if (!result)
 			return FALSE;
-
-		name = e_strstrcase (result, "NAMESPACE ((");
+		
+		name = strstrcase (result, "NAMESPACE ((");
 		if (name) {
 			char *sep;
-
+			
 			name += 12;
 			store->namespace = imap_parse_string (&name, &len);
 			if (name && *name++ == ' ') {
@@ -870,7 +869,7 @@ get_folder (CamelStore *store, const char *folder_name, guint32 flags,
 
 	folder_dir = e_path_to_physical (imap_store->storage_path,
 					 folder_name);
-	if (e_mkdir_hier (folder_dir, S_IRWXU) == 0) {
+	if (camel_mkdir_hier (folder_dir, S_IRWXU) == 0) {
 		new_folder = camel_imap_folder_new (store, folder_name,
 						    short_name, folder_dir,
 						    ex);
@@ -1064,8 +1063,8 @@ get_unread_online (CamelImapStore *imap_store, CamelFolderInfo *fi)
 	status = camel_imap_response_extract (response, "STATUS", NULL);
 	if (!status)
 		return;
-
-	p = e_strstrcase (status, "UNSEEN");
+	
+	p = strstrcase (status, "UNSEEN");
 	if (p)
 		fi->unread_message_count = strtoul (p + 6, NULL, 10);
 	g_free (status);
diff --git a/camel/providers/nntp/camel-nntp-store.c b/camel/providers/nntp/camel-nntp-store.c
index 009058dcd4..494e11f647 100644
--- a/camel/providers/nntp/camel-nntp-store.c
+++ b/camel/providers/nntp/camel-nntp-store.c
@@ -42,8 +42,6 @@
 #include "camel-url.h"
 #include "string-utils.h"
 
-#include <gal/util/e-util.h>
-
 #define NNTP_PORT 119
 
 #define DUMP_EXTENSIONS
@@ -843,7 +841,7 @@ ensure_news_dir_exists (CamelNNTPStore *store)
 		return TRUE;
 	}
 
-	if (e_mkdir_hier (dir, S_IRWXU) == -1) {
+	if (camel_mkdir_hier (dir, S_IRWXU) == -1) {
 		g_free (dir);
 		return FALSE;
 	}
diff --git a/camel/providers/smtp/camel-smtp-transport.c b/camel/providers/smtp/camel-smtp-transport.c
index f2037a83af..5241394058 100644
--- a/camel/providers/smtp/camel-smtp-transport.c
+++ b/camel/providers/smtp/camel-smtp-transport.c
@@ -56,7 +56,7 @@
 #include "camel-session.h"
 #include "camel-exception.h"
 #include "camel-sasl.h"
-#include <gal/util/e-util.h>
+#include "string-utils.h"
 
 #define d(x) x
 
@@ -690,7 +690,7 @@ smtp_helo (CamelSmtpTransport *transport, CamelException *ex)
 			return FALSE;
 		}
 		
-		if (e_strstrcase (respbuf, "8BITMIME")) {
+		if (strstrcase (respbuf, "8BITMIME")) {
 			d(fprintf (stderr, "This server supports 8bit MIME\n"));
 			CAMEL_TRANSPORT (transport)->supports_8bit = TRUE;
 		}