Big header cleanups and nntp compile fix

svn path=/trunk/; revision=9024

35 files changed, 125 insertions, 51 deletions

diff --git a/camel/providers/cache/camel-cache-map.c b/camel/providers/cache/camel-cache-map.c
index d3cece6f60..a826dfe157 100644
--- a/camel/providers/cache/camel-cache-map.c
+++ b/camel/providers/cache/camel-cache-map.c
@@ -23,8 +23,9 @@
  * USA
  */
 
-#include "camel-cache-map.h"
-#include <camel/camel-exception.h>
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <errno.h>
 #include <fcntl.h>
@@ -33,6 +34,9 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
+#include "camel-cache-map.h"
+#include <camel/camel-exception.h>
+
 /**
  * camel_cache_map_new:
  *
@@ -192,7 +196,7 @@ camel_cache_map_write (CamelCacheMap *map, const char *file,
 	if (fd == -1) {
 		g_free (tmpfile);
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      "Could not create cache map file: %s",
+				      _("Could not create cache map file: %s"),
 				      g_strerror (errno));
 		return;
 	}
@@ -202,7 +206,7 @@ camel_cache_map_write (CamelCacheMap *map, const char *file,
 	if (close (fd) == -1 ||
 	    rename (tmpfile, file) == -1) {
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      "Could not save cache map file: %s",
+				      _("Could not save cache map file: %s"),
 				      g_strerror (errno));
 		unlink (tmpfile);
 	}
@@ -231,7 +235,7 @@ camel_cache_map_read (CamelCacheMap *map, const char *file, CamelException *ex)
 	f = fopen (file, "r");
 	if (!f) {
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      "Could not open cache map file: %s",
+				      _("Could not open cache map file: %s"),
 				      g_strerror (errno));
 		return;
 	}
@@ -242,7 +246,7 @@ camel_cache_map_read (CamelCacheMap *map, const char *file, CamelException *ex)
 			q = strchr (buf, '\n');
 		if (!p || !q) {
 			camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM,
-					     "Bad cache file.");
+					     _("Bad cache file."));
 			return;
 		}
 		*p++ = *q = '\0';
diff --git a/camel/providers/cache/camel-cache-provider.c b/camel/providers/cache/camel-cache-provider.c
index 217f06816a..ac2f329d7c 100644
--- a/camel/providers/cache/camel-cache-provider.c
+++ b/camel/providers/cache/camel-cache-provider.c
@@ -23,7 +23,10 @@
  * USA
  */
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "camel-cache-store.h"
 #include "camel-provider.h"
 #include "camel-session.h"
diff --git a/camel/providers/cache/camel-cache-store.c b/camel/providers/cache/camel-cache-store.c
index 544cca69a1..ae076e47d2 100644
--- a/camel/providers/cache/camel-cache-store.c
+++ b/camel/providers/cache/camel-cache-store.c
@@ -23,7 +23,9 @@
  * USA
  */
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -177,7 +179,7 @@ get_folder (CamelStore *store, const char *folder_name,
 	if (!lf) {
 		camel_object_unref (CAMEL_OBJECT (rf));
 		camel_exception_setv (ex, camel_exception_get_id (ex),
-				      "Could not create cache folder:\n%s",
+				      _("Could not create cache folder:\n%s"),
 				      camel_exception_get_description (ex));
 		return NULL;
 	}
diff --git a/camel/providers/imap/camel-imap-command.c b/camel/providers/imap/camel-imap-command.c
index b68216782c..36f88917a8 100644
--- a/camel/providers/imap/camel-imap-command.c
+++ b/camel/providers/imap/camel-imap-command.c
@@ -24,8 +24,9 @@
  *
  */
 
-
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <stdarg.h>
 #include <stdio.h>
diff --git a/camel/providers/imap/camel-imap-command.h b/camel/providers/imap/camel-imap-command.h
index 9dd31b88d2..5b841525fa 100644
--- a/camel/providers/imap/camel-imap-command.h
+++ b/camel/providers/imap/camel-imap-command.h
@@ -33,8 +33,8 @@ extern "C" {
 #pragma }
 #endif /* __cplusplus }*/
 
-#include "camel-imap-types.h"
 #include <glib.h>
+#include "camel-imap-types.h"
 
 struct _CamelImapResponse {
 	CamelFolder *folder;
diff --git a/camel/providers/imap/camel-imap-folder.c b/camel/providers/imap/camel-imap-folder.c
index 84df6c0321..67739e7e46 100644
--- a/camel/providers/imap/camel-imap-folder.c
+++ b/camel/providers/imap/camel-imap-folder.c
@@ -22,8 +22,9 @@
  * USA
  */
 
-
+#ifdef HAVE_CONFIG_H
 #include <config.h> 
+#endif
 
 #include <stdlib.h>
 #include <sys/types.h>
diff --git a/camel/providers/imap/camel-imap-message-cache.c b/camel/providers/imap/camel-imap-message-cache.c
index a45c039242..474a2f2f80 100644
--- a/camel/providers/imap/camel-imap-message-cache.c
+++ b/camel/providers/imap/camel-imap-message-cache.c
@@ -23,7 +23,9 @@
  * USA
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <ctype.h>
 #include <dirent.h>
diff --git a/camel/providers/imap/camel-imap-provider.c b/camel/providers/imap/camel-imap-provider.c
index ce4f30487e..19e72dba5a 100644
--- a/camel/providers/imap/camel-imap-provider.c
+++ b/camel/providers/imap/camel-imap-provider.c
@@ -22,8 +22,11 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
-#include "config.h"
+#include <string.h>
 #include "camel-imap-store.h"
 #include "camel-provider.h"
 #include "camel-session.h"
diff --git a/camel/providers/imap/camel-imap-search.c b/camel/providers/imap/camel-imap-search.c
index 06cf4a8d30..4b913b10c2 100644
--- a/camel/providers/imap/camel-imap-search.c
+++ b/camel/providers/imap/camel-imap-search.c
@@ -23,8 +23,9 @@
  *
  */
 
-
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <string.h>
 
diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c
index daa9871539..40b603acfc 100644
--- a/camel/providers/imap/camel-imap-store.c
+++ b/camel/providers/imap/camel-imap-store.c
@@ -22,8 +22,9 @@
  *
  */
 
-
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -854,7 +855,7 @@ get_folder (CamelStore *store, const char *folder_name, guint32 flags,
 
 	if (!selectable) {
 		camel_exception_setv (ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,
-				      "%s is not a selectable folder",
+				      _("%s is not a selectable folder"),
 				      folder_name);
 		g_free (short_name);
 		return NULL;
diff --git a/camel/providers/imap/camel-imap-summary.c b/camel/providers/imap/camel-imap-summary.c
index 34597cfe31..ca7a2ab737 100644
--- a/camel/providers/imap/camel-imap-summary.c
+++ b/camel/providers/imap/camel-imap-summary.c
@@ -22,9 +22,6 @@
  *  USA
  */
 
-#include "camel-imap-summary.h"
-#include <camel/camel-mime-message.h>
-
 #include <sys/stat.h>
 #include <sys/uio.h>
 #include <unistd.h>
@@ -32,6 +29,9 @@
 #include <string.h>
 #include <stdlib.h>
 
+#include "camel-imap-summary.h"
+#include <camel/camel-mime-message.h>
+
 #define CAMEL_IMAP_SUMMARY_VERSION (0x300)
 
 static int summary_header_load (CamelFolderSummary *, FILE *);
diff --git a/camel/providers/imap/camel-imap-wrapper.c b/camel/providers/imap/camel-imap-wrapper.c
index a0e8b963fc..20ad0c730a 100644
--- a/camel/providers/imap/camel-imap-wrapper.c
+++ b/camel/providers/imap/camel-imap-wrapper.c
@@ -22,7 +22,12 @@
  * USA
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
+#include <errno.h>
+#include <string.h>
 
 #include "camel-imap-folder.h"
 #include "camel-imap-wrapper.h"
@@ -34,9 +39,6 @@
 #include "camel-mime-filter-charset.h"
 #include "camel-mime-part.h"
 
-#include <errno.h>
-#include <string.h>
-
 static CamelDataWrapperClass *parent_class = NULL;
 
 /* Returns the class for a CamelDataWrapper */
diff --git a/camel/providers/local/camel-local-folder.c b/camel/providers/local/camel-local-folder.c
index ea2894aa2e..205606fc90 100644
--- a/camel/providers/local/camel-local-folder.c
+++ b/camel/providers/local/camel-local-folder.c
@@ -20,7 +20,9 @@
  * USA
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <stdlib.h>
 #include <sys/types.h>
diff --git a/camel/providers/local/camel-local-provider.c b/camel/providers/local/camel-local-provider.c
index 59c2982ace..a63ff84eb0 100644
--- a/camel/providers/local/camel-local-provider.c
+++ b/camel/providers/local/camel-local-provider.c
@@ -20,9 +20,12 @@
  * USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 
-#include "config.h"
 #include "camel-provider.h"
 #include "camel-session.h"
 #include "camel-url.h"
diff --git a/camel/providers/local/camel-local-store.c b/camel/providers/local/camel-local-store.c
index 34da035301..d0ce48ce98 100644
--- a/camel/providers/local/camel-local-store.c
+++ b/camel/providers/local/camel-local-store.c
@@ -20,8 +20,9 @@
  * USA
  */
 
-
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <sys/stat.h>
 #include <errno.h>
diff --git a/camel/providers/local/camel-local-summary.c b/camel/providers/local/camel-local-summary.c
index 869b7c712a..8f785afe15 100644
--- a/camel/providers/local/camel-local-summary.c
+++ b/camel/providers/local/camel-local-summary.c
@@ -20,11 +20,11 @@
  *  USA
  */
 
-#include "camel-local-summary.h"
-#include <camel/camel-mime-message.h>
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <ctype.h>
-
 #include <sys/stat.h>
 #include <sys/uio.h>
 #include <unistd.h>
@@ -32,6 +32,9 @@
 #include <string.h>
 #include <stdlib.h>
 
+#include "camel-local-summary.h"
+#include <camel/camel-mime-message.h>
+
 #define io(x)
 #define d(x) /*(printf("%s(%d): ", __FILE__, __LINE__),(x))*/
 
@@ -398,7 +401,7 @@ local_summary_add(CamelLocalSummary *cls, CamelMimeMessage *msg, const CamelMess
 		camel_folder_change_info_add_uid(ci, camel_message_info_uid(mi));
 	} else {
 		d(printf("Failed!\n"));
-		camel_exception_set(ex, 1, "Unable to add message to summary: unknown reason");
+		camel_exception_set(ex, 1, _("Unable to add message to summary: unknown reason"));
 	}
 	return mi;
 }
diff --git a/camel/providers/local/camel-maildir-folder.c b/camel/providers/local/camel-maildir-folder.c
index c4d347d083..198e4ebc00 100644
--- a/camel/providers/local/camel-maildir-folder.c
+++ b/camel/providers/local/camel-maildir-folder.c
@@ -20,7 +20,9 @@
  * USA
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <stdlib.h>
 #include <sys/types.h>
diff --git a/camel/providers/local/camel-maildir-store.c b/camel/providers/local/camel-maildir-store.c
index d419095ea0..8fa4454485 100644
--- a/camel/providers/local/camel-maildir-store.c
+++ b/camel/providers/local/camel-maildir-store.c
@@ -20,7 +20,9 @@
  * USA
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <sys/stat.h>
 #include <errno.h>
diff --git a/camel/providers/local/camel-maildir-summary.c b/camel/providers/local/camel-maildir-summary.c
index 29310e9115..e2ce0f4e97 100644
--- a/camel/providers/local/camel-maildir-summary.c
+++ b/camel/providers/local/camel-maildir-summary.c
@@ -18,8 +18,9 @@
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include "camel-maildir-summary.h"
-#include <camel/camel-mime-message.h>
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <sys/stat.h>
 #include <sys/uio.h>
@@ -33,6 +34,9 @@
 
 #include <ctype.h>
 
+#include "camel-maildir-summary.h"
+#include <camel/camel-mime-message.h>
+
 #include "camel-private.h"
 #include "e-util/e-memory.h"
 
@@ -398,7 +402,7 @@ static int maildir_summary_load(CamelLocalSummary *cls, int forceindex, CamelExc
 
 	dir = opendir(cur);
 	if (dir == NULL) {
-		camel_exception_setv(ex, 1, "Cannot open maildir directory path: %s: %s", cls->folder_path, strerror(errno));
+		camel_exception_setv(ex, 1, _("Cannot open maildir directory path: %s: %s"), cls->folder_path, strerror(errno));
 		g_free(cur);
 		return -1;
 	}
@@ -519,7 +523,7 @@ maildir_summary_check(CamelLocalSummary *cls, CamelFolderChangeInfo *changes, Ca
 	   no longer exist */
 	dir = opendir(cur);
 	if (dir == NULL) {
-		camel_exception_setv(ex, 1, "Cannot open maildir directory path: %s: %s", cls->folder_path, strerror(errno));
+		camel_exception_setv(ex, 1, _("Cannot open maildir directory path: %s: %s"), cls->folder_path, strerror(errno));
 		g_free(cur);
 		g_free(new);
 		return -1;
diff --git a/camel/providers/local/camel-mbox-folder.c b/camel/providers/local/camel-mbox-folder.c
index 14dca0049e..9db90fb40c 100644
--- a/camel/providers/local/camel-mbox-folder.c
+++ b/camel/providers/local/camel-mbox-folder.c
@@ -20,7 +20,9 @@
  * USA
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <stdlib.h>
 #include <sys/types.h>
@@ -147,7 +149,7 @@ static int mbox_lock(CamelLocalFolder *lf, CamelLockType type, CamelException *e
 
 	mf->lockfd = open(lf->folder_path, O_RDWR, 0);
 	if (mf->lockfd == -1) {
-		camel_exception_setv(ex, 1, "Cannot create folder lock on %s: %s", lf->folder_path, strerror(errno));
+		camel_exception_setv(ex, 1, _("Cannot create folder lock on %s: %s"), lf->folder_path, strerror(errno));
 		return -1;
 	}
 
diff --git a/camel/providers/local/camel-mbox-store.c b/camel/providers/local/camel-mbox-store.c
index c6ddc7ce0a..712c7fde37 100644
--- a/camel/providers/local/camel-mbox-store.c
+++ b/camel/providers/local/camel-mbox-store.c
@@ -20,7 +20,9 @@
  * USA
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <sys/stat.h>
 #include <errno.h>
diff --git a/camel/providers/local/camel-mbox-summary.c b/camel/providers/local/camel-mbox-summary.c
index b8219b4c78..a37d1633ff 100644
--- a/camel/providers/local/camel-mbox-summary.c
+++ b/camel/providers/local/camel-mbox-summary.c
@@ -20,6 +20,10 @@
  *  USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "camel-mbox-summary.h"
 #include "camel/camel-mime-message.h"
 #include "camel/camel-operation.h"
diff --git a/camel/providers/local/camel-mh-folder.c b/camel/providers/local/camel-mh-folder.c
index fec620edea..cdf636b533 100644
--- a/camel/providers/local/camel-mh-folder.c
+++ b/camel/providers/local/camel-mh-folder.c
@@ -20,7 +20,9 @@
  * USA
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <stdlib.h>
 #include <sys/types.h>
diff --git a/camel/providers/local/camel-mh-store.c b/camel/providers/local/camel-mh-store.c
index a488a71c12..3edadb5ca1 100644
--- a/camel/providers/local/camel-mh-store.c
+++ b/camel/providers/local/camel-mh-store.c
@@ -20,7 +20,9 @@
  * USA
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <sys/stat.h>
 #include <errno.h>
diff --git a/camel/providers/local/camel-mh-summary.c b/camel/providers/local/camel-mh-summary.c
index c933626653..3e588be909 100644
--- a/camel/providers/local/camel-mh-summary.c
+++ b/camel/providers/local/camel-mh-summary.c
@@ -18,8 +18,9 @@
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include "camel-mh-summary.h"
-#include <camel/camel-mime-message.h>
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <sys/stat.h>
 #include <sys/uio.h>
@@ -33,6 +34,9 @@
 
 #include <ctype.h>
 
+#include "camel-mh-summary.h"
+#include <camel/camel-mime-message.h>
+
 #define d(x) /*(printf("%s(%d): ", __FILE__, __LINE__),(x))*/
 
 #define CAMEL_MH_SUMMARY_VERSION (0x2000)
@@ -211,7 +215,7 @@ mh_summary_check(CamelLocalSummary *cls, CamelFolderChangeInfo *changeinfo, Came
 	   no longer exist */
 	dir = opendir(cls->folder_path);
 	if (dir == NULL) {
-		camel_exception_setv(ex, 1, "Cannot open MH directory path: %s: %s", cls->folder_path, strerror(errno));
+		camel_exception_setv(ex, 1, _("Cannot open MH directory path: %s: %s"), cls->folder_path, strerror(errno));
 		return -1;
 	}
 
diff --git a/camel/providers/nntp/camel-nntp-auth.c b/camel/providers/nntp/camel-nntp-auth.c
index 1f1e6ab2d8..b211f52593 100644
--- a/camel/providers/nntp/camel-nntp-auth.c
+++ b/camel/providers/nntp/camel-nntp-auth.c
@@ -21,7 +21,11 @@
  * USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
+#include <string.h>
 #include <camel-nntp-auth.h>
 #include <camel-nntp-store.h>
 #include <camel-nntp-resp-codes.h>
diff --git a/camel/providers/nntp/camel-nntp-grouplist.c b/camel/providers/nntp/camel-nntp-grouplist.c
index d7ee85d182..578a6eba66 100644
--- a/camel/providers/nntp/camel-nntp-grouplist.c
+++ b/camel/providers/nntp/camel-nntp-grouplist.c
@@ -98,7 +98,7 @@ camel_nntp_get_grouplist_from_file (CamelNNTPStore *store, CamelException *ex)
 	}
 
 	/* read the time */
-	if (!fgets (buf, 300, fp)) {
+	if (!fgets (buf, sizeof (buf), fp)) {
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
 				      _("Unable to load grouplist file for %s: %s"),
 				      CAMEL_SERVICE(store)->url->host,
@@ -113,7 +113,7 @@ camel_nntp_get_grouplist_from_file (CamelNNTPStore *store, CamelException *ex)
 	sscanf (buf, "%lu", &time);
 	list->time = time;
 
-	while (fgets (buf, 300, fp)) {
+	while (fgets (buf, sizeof (buf), fp)) {
 		CamelNNTPGroupListEntry *entry = g_new (CamelNNTPGroupListEntry, 1);
 		char **split_line = g_strsplit (buf, " ", 4);
 
diff --git a/camel/providers/nntp/camel-nntp-provider.c b/camel/providers/nntp/camel-nntp-provider.c
index 76ac521ec6..07857c173c 100644
--- a/camel/providers/nntp/camel-nntp-provider.c
+++ b/camel/providers/nntp/camel-nntp-provider.c
@@ -23,7 +23,11 @@
  * USA
  */
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <string.h>
 #include "camel-nntp-store.h"
 #include "camel-provider.h"
 #include "camel-session.h"
@@ -47,9 +51,7 @@ static CamelProvider news_provider = {
 	CAMEL_URL_NEED_HOST | CAMEL_URL_ALLOW_USER |
 	CAMEL_URL_ALLOW_PASSWORD | CAMEL_URL_ALLOW_AUTH,
 
-	{ 0, 0 },
-
-	NULL
+	/* ... */
 };
 
 void
diff --git a/camel/providers/nntp/camel-nntp-store.c b/camel/providers/nntp/camel-nntp-store.c
index c1e8fb81e8..009058dcd4 100644
--- a/camel/providers/nntp/camel-nntp-store.c
+++ b/camel/providers/nntp/camel-nntp-store.c
@@ -305,7 +305,7 @@ nntp_store_query_auth_types (CamelService *service, gboolean connect, CamelExcep
 	GList *prev;
 	
 	g_warning ("nntp::query_auth_types: not implemented. Defaulting.");
-	prev = CAMEL_SERVICE_CLASS (remote_store_class)->query_auth_types (service, connect, ex);
+	prev = CAMEL_SERVICE_CLASS (remote_store_class)->query_auth_types (service, ex);
 	return g_list_prepend (prev, &password_authtype);
 }
 
diff --git a/camel/providers/pop3/camel-pop3-provider.c b/camel/providers/pop3/camel-pop3-provider.c
index 6dae1f6edb..0931f903ed 100644
--- a/camel/providers/pop3/camel-pop3-provider.c
+++ b/camel/providers/pop3/camel-pop3-provider.c
@@ -23,7 +23,10 @@
  * USA
  */
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "camel-pop3-store.h"
 #include "camel-provider.h"
 #include "camel-session.h"
diff --git a/camel/providers/pop3/camel-pop3-store.c b/camel/providers/pop3/camel-pop3-store.c
index 558d8a8b38..17b2fdf8ee 100644
--- a/camel/providers/pop3/camel-pop3-store.c
+++ b/camel/providers/pop3/camel-pop3-store.c
@@ -23,7 +23,9 @@
  * USA
  */
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/camel/providers/sendmail/camel-sendmail-provider.c b/camel/providers/sendmail/camel-sendmail-provider.c
index 5a7cfb82db..2e9168f772 100644
--- a/camel/providers/sendmail/camel-sendmail-provider.c
+++ b/camel/providers/sendmail/camel-sendmail-provider.c
@@ -23,7 +23,10 @@
  * USA
  */
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "camel-provider.h"
 #include "camel-sendmail-transport.h"
 #include "camel-session.h"
diff --git a/camel/providers/sendmail/camel-sendmail-transport.c b/camel/providers/sendmail/camel-sendmail-transport.c
index 71595ca218..9cd0c1efa1 100644
--- a/camel/providers/sendmail/camel-sendmail-transport.c
+++ b/camel/providers/sendmail/camel-sendmail-transport.c
@@ -23,7 +23,9 @@
  * USA
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/camel/providers/smtp/camel-smtp-provider.c b/camel/providers/smtp/camel-smtp-provider.c
index 96cba49594..b84a6a0d83 100644
--- a/camel/providers/smtp/camel-smtp-provider.c
+++ b/camel/providers/smtp/camel-smtp-provider.c
@@ -23,7 +23,10 @@
  * USA
  */
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "camel-smtp-transport.h"
 #include "camel-provider.h"
 #include "camel-session.h"
diff --git a/camel/providers/smtp/camel-smtp-transport.c b/camel/providers/smtp/camel-smtp-transport.c
index 8b49aaa2f0..a6572d4bdc 100644
--- a/camel/providers/smtp/camel-smtp-transport.c
+++ b/camel/providers/smtp/camel-smtp-transport.c
@@ -22,7 +22,9 @@
  * USA
  */
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -331,8 +333,8 @@ smtp_connect (CamelService *service, CamelException *ex)
 		
 		if (!transport->is_esmtp || !g_hash_table_lookup (transport->authtypes, service->url->authmech)) {
 			camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,
-					      "SMTP server %s does not support requested "
-					      "authentication type %s", service->url->host,
+					      _("SMTP server %s does not support requested "
+					      "authentication type %s"), service->url->host,
 					      service->url->authmech);
 			camel_service_disconnect (service, TRUE, NULL);
 			return FALSE;
@@ -341,7 +343,7 @@ smtp_connect (CamelService *service, CamelException *ex)
 		authtype = camel_sasl_authtype (service->url->authmech);
 		if (!authtype) {
 			camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,
-					      "No support for authentication type %s",
+					      _("No support for authentication type %s"),
 					      service->url->authmech);
 			camel_service_disconnect (service, TRUE, NULL);
 			return FALSE;