5 files changed, 7 insertions, 10 deletions
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>