Big header cleanups and nntp compile fix

svn path=/trunk/; revision=9024

9 files changed, 24 insertions, 13 deletions

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 */