8 files changed, 9 insertions, 13 deletions
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)