From 719c45db28aa72419298c9f05957af66fb5dc19e Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@novell.com>
Date: Tue, 6 Dec 2005 04:21:56 +0000
Subject: [PATCH] camel-index.c camel-mime-filter-basic.c
 camel-mime-filter-charset.c

2005-12-01  Tor Lillqvist  <tml@novell.com>

	* camel-index.c
	* camel-mime-filter-basic.c
	* camel-mime-filter-charset.c
	* camel-mime-filter-from.c
	* camel-mime-filter-index.c
	* camel-mime-filter-windows.c
	* camel-mime-filter.c
	* camel-mime-part-utils.c
	* camel-multipart-encrypted.c
	* camel-multipart-signed.c
	* camel-multipart.c
	* camel-offline-folder.c
	* camel-offline-store.c
	* camel-operation.c
	* camel-sasl-anonymous.c
	* camel-sasl-cram-md5.c
	* camel-sasl-digest-md5.c
	* camel-sasl-kerberos4.c
	* camel-sasl-login.c
	* camel-sasl-ntlm.c
	* camel-sasl-plain.c
	* camel-sasl.c
	* camel-search-private.c
	* camel-service.c
	* camel-smime-context.c
	* camel-store.c
	* camel-stream-buffer.c
	* camel-stream-filter.c
	* camel-stream-process.c
	* camel-stream.c
	* camel-transport.c
	* camel-url-scanner.c
	* camel-vee-folder.c
	* camel-vee-summary.c
	* camel-vtrash-folder.c
	* camel.c: Unify header inclusion order and style purely for
	cosmetic reasons.
---
 camel/ChangeLog                   | 38 ++++++++++++++++++++++++++++++++++++++
 camel/camel-index.c               |  2 +-
 camel/camel-mime-filter-basic.c   |  4 ++--
 camel/camel-mime-filter-charset.c |  2 +-
 camel/camel-mime-filter-from.c    |  1 +
 camel/camel-mime-filter-index.c   |  1 -
 camel/camel-mime-filter-windows.c |  3 +--
 camel/camel-mime-filter.c         |  1 +
 camel/camel-mime-part-utils.c     | 20 ++++++++++----------
 camel/camel-multipart-encrypted.c | 10 +++++-----
 camel/camel-multipart-signed.c    | 22 ++++++++++------------
 camel/camel-multipart.c           |  5 +++--
 camel/camel-offline-folder.c      |  9 ++++-----
 camel/camel-offline-store.c       |  9 ++++-----
 camel/camel-operation.c           |  3 ++-
 camel/camel-sasl-anonymous.c      |  6 +++---
 camel/camel-sasl-cram-md5.c       |  8 +++++---
 camel/camel-sasl-digest-md5.c     |  9 ++++-----
 camel/camel-sasl-kerberos4.c      |  3 ++-
 camel/camel-sasl-login.c          |  3 ++-
 camel/camel-sasl-ntlm.c           |  2 +-
 camel/camel-sasl-plain.c          |  3 ++-
 camel/camel-sasl.c                |  8 ++++----
 camel/camel-search-private.c      | 11 ++++++-----
 camel/camel-service.c             |  6 +++---
 camel/camel-smime-context.c       | 24 +++++++++++-------------
 camel/camel-store.c               |  9 ++++-----
 camel/camel-stream-buffer.c       |  1 +
 camel/camel-stream-filter.c       |  1 +
 camel/camel-stream-process.c      |  2 +-
 camel/camel-stream.c              |  1 +
 camel/camel-transport.c           |  2 +-
 camel/camel-url-scanner.c         |  3 ++-
 camel/camel-vee-folder.c          | 26 +++++++++++++-------------
 camel/camel-vee-summary.c         |  2 +-
 camel/camel-vtrash-folder.c       | 11 ++++++-----
 camel/camel.c                     |  9 ++++++---
 37 files changed, 163 insertions(+), 117 deletions(-)

diff --git a/camel/ChangeLog b/camel/ChangeLog
index 0ababe0..659f074 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -7,6 +7,44 @@
 
 2005-12-01  Tor Lillqvist  <tml@novell.com>
 
+	* camel-index.c
+	* camel-mime-filter-basic.c
+	* camel-mime-filter-charset.c
+	* camel-mime-filter-from.c
+	* camel-mime-filter-index.c
+	* camel-mime-filter-windows.c
+	* camel-mime-filter.c
+	* camel-mime-part-utils.c
+	* camel-multipart-encrypted.c
+	* camel-multipart-signed.c
+	* camel-multipart.c
+	* camel-offline-folder.c
+	* camel-offline-store.c
+	* camel-operation.c
+	* camel-sasl-anonymous.c
+	* camel-sasl-cram-md5.c
+	* camel-sasl-digest-md5.c
+	* camel-sasl-kerberos4.c
+	* camel-sasl-login.c
+	* camel-sasl-ntlm.c
+	* camel-sasl-plain.c
+	* camel-sasl.c
+	* camel-search-private.c
+	* camel-service.c
+	* camel-smime-context.c
+	* camel-store.c
+	* camel-stream-buffer.c
+	* camel-stream-filter.c
+	* camel-stream-process.c
+	* camel-stream.c
+	* camel-transport.c
+	* camel-url-scanner.c
+	* camel-vee-folder.c
+	* camel-vee-summary.c
+	* camel-vtrash-folder.c
+	* camel.c: Unify header inclusion order and style purely for
+	cosmetic reasons.
+
 	* camel-private.h: If building against a GLib older than 2.8, map
 	those gstdio wrappers that were introduced only in 2.8 to their
 	normal counterparts here. (When building for Win32, we require
diff --git a/camel/camel-index.c b/camel/camel-index.c
index 95d0ec5..e455db4 100644
--- a/camel/camel-index.c
+++ b/camel/camel-index.c
@@ -31,7 +31,7 @@
 #include <stdlib.h>
 
 #include "camel-index.h"
-#include "camel/camel-object.h"
+#include "camel-object.h"
 
 #define w(x)
 #define io(x)
diff --git a/camel/camel-mime-filter-basic.c b/camel/camel-mime-filter-basic.c
index 460c3ac..99ff349 100644
--- a/camel/camel-mime-filter-basic.c
+++ b/camel/camel-mime-filter-basic.c
@@ -19,10 +19,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "camel-mime-filter-basic.h"
+#include <string.h>
 
+#include "camel-mime-filter-basic.h"
 #include "camel-mime-utils.h"
-#include <string.h>
 
 static void reset(CamelMimeFilter *mf);
 static void complete(CamelMimeFilter *mf, char *in, size_t len, 
diff --git a/camel/camel-mime-filter-charset.c b/camel/camel-mime-filter-charset.c
index a914c09..11f2400 100644
--- a/camel/camel-mime-filter-charset.c
+++ b/camel/camel-mime-filter-charset.c
@@ -27,7 +27,7 @@
 #include <string.h>
 #include <errno.h>
 
-#include <libedataserver/e-iconv.h>
+#include "libedataserver/e-iconv.h"
 
 #include "camel-mime-filter-charset.h"
 #include "camel-charset-map.h"
diff --git a/camel/camel-mime-filter-from.c b/camel/camel-mime-filter-from.c
index b28aec8..ef5543f 100644
--- a/camel/camel-mime-filter-from.c
+++ b/camel/camel-mime-filter-from.c
@@ -25,6 +25,7 @@
 #endif
 
 #include <string.h>
+
 #include "camel-mime-filter-from.h"
 
 #define d(x)
diff --git a/camel/camel-mime-filter-index.c b/camel/camel-mime-filter-index.c
index 35f864e..a2b1396 100644
--- a/camel/camel-mime-filter-index.c
+++ b/camel/camel-mime-filter-index.c
@@ -19,7 +19,6 @@
  */
 
 #include "camel-mime-filter-index.h"
-
 #include "camel-text-index.h"
 
 static void camel_mime_filter_index_class_init (CamelMimeFilterIndexClass *klass);
diff --git a/camel/camel-mime-filter-windows.c b/camel/camel-mime-filter-windows.c
index 330ee61..b7d1bf5 100644
--- a/camel/camel-mime-filter-windows.c
+++ b/camel/camel-mime-filter-windows.c
@@ -29,9 +29,8 @@
 #include <string.h>
 #include <ctype.h>
 
-#include "camel-mime-filter-windows.h"
-
 #include "camel-charset-map.h"
+#include "camel-mime-filter-windows.h"
 
 #define d(x)
 #define w(x)
diff --git a/camel/camel-mime-filter.c b/camel/camel-mime-filter.c
index 59543a0..42f4ca6 100644
--- a/camel/camel-mime-filter.c
+++ b/camel/camel-mime-filter.c
@@ -19,6 +19,7 @@
  */
 
 #include <string.h>
+
 #include "camel-mime-filter.h"
 
 /*#define MALLOC_CHECK */ /* for some malloc checking, requires mcheck enabled */
diff --git a/camel/camel-mime-part-utils.c b/camel/camel-mime-part-utils.c
index 75bd470..4eaef79 100644
--- a/camel/camel-mime-part-utils.c
+++ b/camel/camel-mime-part-utils.c
@@ -32,23 +32,23 @@
 #include <ctype.h>
 #include <errno.h>
 
-#include <libedataserver/e-iconv.h>
+#include "libedataserver/e-iconv.h"
 
 #include "camel-charset-map.h"
-#include "camel-mime-part-utils.h"
+#include "camel-html-parser.h"
+#include "camel-mime-filter-basic.h"
+#include "camel-mime-filter-charset.h"
+#include "camel-mime-filter-crlf.h"
+#include "camel-mime-filter-save.h"
 #include "camel-mime-message.h"
-#include "camel-multipart.h"
-#include "camel-multipart-signed.h"
+#include "camel-mime-part-utils.h"
 #include "camel-multipart-encrypted.h"
+#include "camel-multipart-signed.h"
+#include "camel-multipart.h"
 #include "camel-seekable-substream.h"
-#include "camel-stream-fs.h"
 #include "camel-stream-filter.h"
+#include "camel-stream-fs.h"
 #include "camel-stream-mem.h"
-#include "camel-mime-filter-basic.h"
-#include "camel-mime-filter-charset.h"
-#include "camel-mime-filter-crlf.h"
-#include "camel-mime-filter-save.h"
-#include "camel-html-parser.h"
 
 #define d(x) /*(printf("%s(%d): ", __FILE__, __LINE__),(x))
 	       #include <stdio.h>*/
diff --git a/camel/camel-multipart-encrypted.c b/camel/camel-multipart-encrypted.c
index c7a8981..df29468 100644
--- a/camel/camel-multipart-encrypted.c
+++ b/camel/camel-multipart-encrypted.c
@@ -28,14 +28,14 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "camel-multipart-encrypted.h"
+#include "camel-i18n.h"
 #include "camel-mime-filter-crlf.h"
+#include "camel-mime-part.h"
+#include "camel-mime-utils.h"
+#include "camel-multipart-encrypted.h"
 #include "camel-stream-filter.h"
-#include "camel-stream-mem.h"
 #include "camel-stream-fs.h"
-#include "camel-mime-utils.h"
-#include "camel-mime-part.h"
-#include "camel-i18n.h"
+#include "camel-stream-mem.h"
 
 static void camel_multipart_encrypted_class_init (CamelMultipartEncryptedClass *klass);
 static void camel_multipart_encrypted_init (gpointer object, gpointer klass);
diff --git a/camel/camel-multipart-signed.c b/camel/camel-multipart-signed.c
index 571cd3b..b3d86a4 100644
--- a/camel/camel-multipart-signed.c
+++ b/camel/camel-multipart-signed.c
@@ -29,27 +29,25 @@
 #endif
 
 #include <stdio.h>
-
 #include <string.h>
 #include <unistd.h>
 #include <time.h>
-
 #include <errno.h>
 
-#include "camel-mime-part.h"
+#include "libedataserver/md5-utils.h"
+
+#include "camel-exception.h"
+#include "camel-i18n.h"
+#include "camel-mime-filter-canon.h"
+#include "camel-mime-filter-crlf.h"
 #include "camel-mime-message.h"
 #include "camel-mime-parser.h"
-#include "camel-stream-mem.h"
-#include "camel-multipart-signed.h"
 #include "camel-mime-part.h"
-#include "camel-exception.h"
-#include "libedataserver/md5-utils.h"
-
-#include "camel-stream-filter.h"
+#include "camel-mime-part.h"
+#include "camel-multipart-signed.h"
 #include "camel-seekable-substream.h"
-#include "camel-mime-filter-crlf.h"
-#include "camel-mime-filter-canon.h"
-#include "camel-i18n.h"
+#include "camel-stream-filter.h"
+#include "camel-stream-mem.h"
 
 #define d(x) /*(printf("%s(%d): ", __FILE__, __LINE__),(x))
 	       #include <stdio.h>;*/
diff --git a/camel/camel-multipart.c b/camel/camel-multipart.c
index d4d8bae..2fabb90 100644
--- a/camel/camel-multipart.c
+++ b/camel/camel-multipart.c
@@ -31,11 +31,12 @@
 #include <time.h>   /* for time */
 #include <errno.h>
 
+#include "libedataserver/md5-utils.h"
+
 #include "camel-stream-mem.h"
 #include "camel-multipart.h"
-#include "camel-mime-part.h"
 #include "camel-exception.h"
-#include "libedataserver/md5-utils.h"
+#include "camel-mime-part.h"
 
 #define d(x)
 
diff --git a/camel/camel-offline-folder.c b/camel/camel-offline-folder.c
index 4ab48d3..8e58a8e 100644
--- a/camel/camel-offline-folder.c
+++ b/camel/camel-offline-folder.c
@@ -25,12 +25,11 @@
 #include <config.h>
 #endif
 
-#include <camel/camel-i18n.h>
-#include <camel/camel-service.h>
-#include <camel/camel-session.h>
-#include <camel/camel-operation.h>
-
+#include "camel-i18n.h"
 #include "camel-offline-folder.h"
+#include "camel-operation.h"
+#include "camel-service.h"
+#include "camel-session.h"
 
 #define CAMEL_OFFLINE_FOLDER_GET_CLASS(f) (CAMEL_OFFLINE_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS (f)))
 
diff --git a/camel/camel-offline-store.c b/camel/camel-offline-store.c
index 24c4bbc..3459311 100644
--- a/camel/camel-offline-store.c
+++ b/camel/camel-offline-store.c
@@ -25,12 +25,11 @@
 #include <config.h>
 #endif
 
-#include <camel/camel-i18n.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-session.h>
-
-#include "camel-offline-store.h"
+#include "camel-folder.h"
+#include "camel-i18n.h"
 #include "camel-offline-folder.h"
+#include "camel-offline-store.h"
+#include "camel-session.h"
 
 
 static void camel_offline_store_class_init (CamelOfflineStoreClass *klass);
diff --git a/camel/camel-operation.c b/camel/camel-operation.c
index 97baf8d..f6cf249 100644
--- a/camel/camel-operation.c
+++ b/camel/camel-operation.c
@@ -34,9 +34,10 @@
 #include <nspr.h>
 #endif
 
-#include "camel-operation.h"
 #include "libedataserver/e-msgport.h"
 
+#include "camel-operation.h"
+
 #define d(x)
 
 /* ********************************************************************** */
diff --git a/camel/camel-sasl-anonymous.c b/camel/camel-sasl-anonymous.c
index 53cd14d..e353af6 100644
--- a/camel/camel-sasl-anonymous.c
+++ b/camel/camel-sasl-anonymous.c
@@ -26,10 +26,10 @@
 #endif
 
 #include <string.h>
-#include "camel-sasl-anonymous.h"
-#include "camel-internet-address.h"
-#include <string.h>
+
 #include "camel-i18n.h"
+#include "camel-internet-address.h"
+#include "camel-sasl-anonymous.h"
 
 CamelServiceAuthType camel_sasl_anonymous_authtype = {
 	N_("Anonymous"),
diff --git a/camel/camel-sasl-cram-md5.c b/camel/camel-sasl-cram-md5.c
index 560c1d2..ba73f7d 100644
--- a/camel/camel-sasl-cram-md5.c
+++ b/camel/camel-sasl-cram-md5.c
@@ -26,11 +26,13 @@
 
 #include <stdio.h>
 #include <string.h>
-#include "camel-sasl-cram-md5.h"
+
+#include "libedataserver/md5-utils.h"
+
+#include "camel-i18n.h"
 #include "camel-mime-utils.h"
+#include "camel-sasl-cram-md5.h"
 #include "camel-service.h"
-#include <libedataserver/md5-utils.h>
-#include "camel-i18n.h"
 
 CamelServiceAuthType camel_sasl_cram_md5_authtype = {
 	N_("CRAM-MD5"),
diff --git a/camel/camel-sasl-digest-md5.c b/camel/camel-sasl-digest-md5.c
index dfb5821..63303a6 100644
--- a/camel/camel-sasl-digest-md5.c
+++ b/camel/camel-sasl-digest-md5.c
@@ -29,15 +29,14 @@
 #include <ctype.h>
 #include <unistd.h>
 
-#include <libedataserver/md5-utils.h>
-
-#include <libedataserver/e-iconv.h>
+#include "libedataserver/e-iconv.h"
+#include "libedataserver/md5-utils.h"
 
 #include "camel-charset-map.h"
-#include "camel-mime-utils.h"
-#include "camel-sasl-digest-md5.h"
 #include "camel-i18n.h"
+#include "camel-mime-utils.h"
 #include "camel-net-utils.h"
+#include "camel-sasl-digest-md5.h"
 
 #define d(x)
 
diff --git a/camel/camel-sasl-kerberos4.c b/camel/camel-sasl-kerberos4.c
index e61650b..a954ee7 100644
--- a/camel/camel-sasl-kerberos4.c
+++ b/camel/camel-sasl-kerberos4.c
@@ -34,11 +34,12 @@
 
 #include <string.h>
 #include <netdb.h>
+
 #include "camel-i18n.h"
 #include "camel-net-utils.h"
-#include "camel-string-utils.h"
 #include "camel-sasl-kerberos4.h"
 #include "camel-service.h"
+#include "camel-string-utils.h"
 
 CamelServiceAuthType camel_sasl_kerberos4_authtype = {
 	N_("Kerberos 4"),
diff --git a/camel/camel-sasl-login.c b/camel/camel-sasl-login.c
index 5e304f8..23ac82a 100644
--- a/camel/camel-sasl-login.c
+++ b/camel/camel-sasl-login.c
@@ -25,9 +25,10 @@
 #endif
 
 #include <string.h>
+
+#include "camel-i18n.h"
 #include "camel-sasl-login.h"
 #include "camel-service.h"
-#include "camel-i18n.h"
 
 CamelServiceAuthType camel_sasl_login_authtype = {
 	N_("Login"),
diff --git a/camel/camel-sasl-ntlm.c b/camel/camel-sasl-ntlm.c
index 3748c00..3813593 100644
--- a/camel/camel-sasl-ntlm.c
+++ b/camel/camel-sasl-ntlm.c
@@ -25,8 +25,8 @@
 #include <ctype.h>
 #include <string.h>
 
-#include "camel-sasl-ntlm.h"
 #include "camel-i18n.h"
+#include "camel-sasl-ntlm.h"
 
 CamelServiceAuthType camel_sasl_ntlm_authtype = {
 	N_("NTLM / SPA"),
diff --git a/camel/camel-sasl-plain.c b/camel/camel-sasl-plain.c
index b65b8fe..2d03b52 100644
--- a/camel/camel-sasl-plain.c
+++ b/camel/camel-sasl-plain.c
@@ -25,9 +25,10 @@
 #endif
 
 #include <string.h>
+
+#include "camel-i18n.h"
 #include "camel-sasl-plain.h"
 #include "camel-service.h"
-#include "camel-i18n.h"
 
 CamelServiceAuthType camel_sasl_plain_authtype = {
 	N_("PLAIN"),
diff --git a/camel/camel-sasl.c b/camel/camel-sasl.c
index c8ec931..18a4216 100644
--- a/camel/camel-sasl.c
+++ b/camel/camel-sasl.c
@@ -26,18 +26,18 @@
 #endif
 
 #include <string.h>
-#include "camel-sasl.h"
-#include "camel-mime-utils.h"
-#include "camel-service.h"
 
+#include "camel-mime-utils.h"
 #include "camel-sasl-cram-md5.h"
 #include "camel-sasl-digest-md5.h"
 #include "camel-sasl-gssapi.h"
 #include "camel-sasl-kerberos4.h"
 #include "camel-sasl-login.h"
+#include "camel-sasl-ntlm.h"
 #include "camel-sasl-plain.h"
 #include "camel-sasl-popb4smtp.h"
-#include "camel-sasl-ntlm.h"
+#include "camel-sasl.h"
+#include "camel-service.h"
 
 
 #define w(x)
diff --git a/camel/camel-search-private.c b/camel/camel-search-private.c
index 783f98e..97744e4 100644
--- a/camel/camel-search-private.c
+++ b/camel/camel-search-private.c
@@ -29,22 +29,23 @@
 #include <config.h>
 #endif
 
-#include <glib.h>
 #include <sys/types.h>
 #include <regex.h>
 #include <string.h>
 #include <ctype.h>
 #include <stdio.h>
 
+#include <glib.h>
+
+#include "libedataserver/e-sexp.h"
+
 #include "camel-exception.h"
+#include "camel-i18n.h"
 #include "camel-mime-message.h"
 #include "camel-multipart.h"
-#include "camel-stream-mem.h"
-#include "libedataserver/e-sexp.h"
 #include "camel-search-private.h"
-#include "camel-i18n.h"
+#include "camel-stream-mem.h"
 
-#include <glib/gunicode.h>
 
 #define d(x)
 
diff --git a/camel/camel-service.c b/camel/camel-service.c
index 77942ec..48330fd 100644
--- a/camel/camel-service.c
+++ b/camel/camel-service.c
@@ -36,12 +36,12 @@
 
 #include "libedataserver/e-msgport.h"
 
-#include "camel-service.h"
-#include "camel-session.h"
 #include "camel-exception.h"
+#include "camel-i18n.h"
 #include "camel-operation.h"
 #include "camel-private.h"
-#include "camel-i18n.h"
+#include "camel-service.h"
+#include "camel-session.h"
 
 #define d(x)
 #define w(x)
diff --git a/camel/camel-smime-context.c b/camel/camel-smime-context.c
index a52b3eb..a06aa54 100644
--- a/camel/camel-smime-context.c
+++ b/camel/camel-smime-context.c
@@ -43,20 +43,18 @@
 
 #include <errno.h>
 
-#include <camel/camel-exception.h>
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-data-wrapper.h>
-
-#include <camel/camel-mime-part.h>
-#include <camel/camel-multipart-signed.h>
-#include <camel/camel-stream-fs.h>
-#include <camel/camel-stream-filter.h>
-#include <camel/camel-mime-filter-basic.h>
-#include <camel/camel-mime-filter-canon.h>
-
-#include "camel-smime-context.h"
-#include "camel-operation.h"
+#include "camel-data-wrapper.h"
+#include "camel-exception.h"
 #include "camel-i18n.h"
+#include "camel-mime-filter-basic.h"
+#include "camel-mime-filter-canon.h"
+#include "camel-mime-part.h"
+#include "camel-multipart-signed.h"
+#include "camel-operation.h"
+#include "camel-smime-context.h"
+#include "camel-stream-filter.h"
+#include "camel-stream-fs.h"
+#include "camel-stream-mem.h"
 
 #define d(x)
 
diff --git a/camel/camel-store.c b/camel/camel-store.c
index 5ee4a9e..ac7c768 100644
--- a/camel/camel-store.c
+++ b/camel/camel-store.c
@@ -32,14 +32,13 @@
 #include <sys/stat.h>
 
 #include "camel-debug.h"
-
+#include "camel-exception.h"
+#include "camel-folder.h"
+#include "camel-i18n.h"
+#include "camel-private.h"
 #include "camel-session.h"
 #include "camel-store.h"
-#include "camel-folder.h"
 #include "camel-vtrash-folder.h"
-#include "camel-exception.h"
-#include "camel-private.h"
-#include "camel-i18n.h"
 
 #define d(x)
 #define w(x)
diff --git a/camel/camel-stream-buffer.c b/camel/camel-stream-buffer.c
index 79d3fe8..d066132 100644
--- a/camel/camel-stream-buffer.c
+++ b/camel/camel-stream-buffer.c
@@ -30,6 +30,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <errno.h>
+
 #include "camel-stream-buffer.h"
 
 static CamelStreamClass *parent_class = NULL;
diff --git a/camel/camel-stream-filter.c b/camel/camel-stream-filter.c
index 17747ff..340820d 100644
--- a/camel/camel-stream-filter.c
+++ b/camel/camel-stream-filter.c
@@ -26,6 +26,7 @@
 
 #include <stdio.h>
 #include <string.h>
+
 #include "camel-stream-filter.h"
 
 #define d(x) 
diff --git a/camel/camel-stream-process.c b/camel/camel-stream-process.c
index af68871..6b249d1 100644
--- a/camel/camel-stream-process.c
+++ b/camel/camel-stream-process.c
@@ -39,8 +39,8 @@
 #include <fcntl.h>
 #include <errno.h>
 
-#include "camel-stream-process.h"
 #include "camel-file-utils.h"
+#include "camel-stream-process.h"
 
 extern int camel_verbose_debug;
 
diff --git a/camel/camel-stream.c b/camel/camel-stream.c
index e05a942..3ef466a 100644
--- a/camel/camel-stream.c
+++ b/camel/camel-stream.c
@@ -28,6 +28,7 @@
 #endif
 
 #include <string.h>
+
 #include "camel-stream.h"
 
 static CamelObjectClass *parent_class = NULL;
diff --git a/camel/camel-transport.c b/camel/camel-transport.c
index 8232523..8361698 100644
--- a/camel/camel-transport.c
+++ b/camel/camel-transport.c
@@ -27,10 +27,10 @@
 #include <config.h>
 #endif
 
-#include "camel-transport.h"
 #include "camel-address.h"
 #include "camel-mime-message.h"
 #include "camel-private.h"
+#include "camel-transport.h"
 
 static CamelServiceClass *parent_class = NULL;
 
diff --git a/camel/camel-url-scanner.c b/camel/camel-url-scanner.c
index 66356e5..14520db 100644
--- a/camel/camel-url-scanner.c
+++ b/camel/camel-url-scanner.c
@@ -30,8 +30,9 @@
 #include <ctype.h>
 
 #include "libedataserver/e-trie.h"
-#include "camel-utf8.h"
+
 #include "camel-url-scanner.h"
+#include "camel-utf8.h"
 
 
 struct _CamelUrlScanner {
diff --git a/camel/camel-vee-folder.c b/camel/camel-vee-folder.c
index d6faeb1..2b2b673 100644
--- a/camel/camel-vee-folder.c
+++ b/camel/camel-vee-folder.c
@@ -26,25 +26,25 @@
 
 #include <string.h>
 
-#include "camel-exception.h"
-#include "camel-vee-folder.h"
-#include "camel-store.h"
-#include "camel-mime-message.h"
-#include "camel-folder-search.h"
-#include "camel-vee-summary.h"
-
-#include "camel-session.h"
-#include "camel-vee-store.h"	/* for open flags */
-#include "camel-private.h"
-#include "camel-debug.h"
-#include "camel-i18n.h"
-
 #include "libedataserver/md5-utils.h"
 
 #if defined (DOEPOOLV) || defined (DOESTRV)
 #include "libedataserver/e-memory.h"
 #endif
 
+#include "camel-debug.h"
+#include "camel-exception.h"
+#include "camel-folder-search.h"
+#include "camel-i18n.h"
+#include "camel-mime-message.h"
+#include "camel-private.h"
+#include "camel-session.h"
+#include "camel-store.h"
+#include "camel-vee-folder.h"
+#include "camel-vee-store.h"	/* for open flags */
+#include "camel-vee-summary.h"
+
+
 #define d(x) 
 #define dd(x) (camel_debug("vfolder")?(x):0)
 
diff --git a/camel/camel-vee-summary.c b/camel/camel-vee-summary.c
index 7b0ea71..44ef6d2 100644
--- a/camel/camel-vee-summary.c
+++ b/camel/camel-vee-summary.c
@@ -29,8 +29,8 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "camel-vee-summary.h"
 #include "camel-folder.h"
+#include "camel-vee-summary.h"
 
 #define d(x)
 
diff --git a/camel/camel-vtrash-folder.c b/camel/camel-vtrash-folder.c
index 7b8fe3a..9e473b1 100644
--- a/camel/camel-vtrash-folder.c
+++ b/camel/camel-vtrash-folder.c
@@ -23,15 +23,16 @@
 
 #include <config.h>
 
+#include <string.h>
+
 #include "camel-exception.h"
-#include "camel-vtrash-folder.h"
-#include "camel-store.h"
-#include "camel-vee-store.h"
-#include "camel-mime-message.h"
 #include "camel-i18n.h"
+#include "camel-mime-message.h"
 #include "camel-private.h"
+#include "camel-store.h"
+#include "camel-vee-store.h"
+#include "camel-vtrash-folder.h"
 
-#include <string.h>
 
 /* Returns the class for a CamelFolder */
 #define CF_CLASS(so) ((CamelFolderClass *)((CamelObject *)(so))->klass)
diff --git a/camel/camel.c b/camel/camel.c
index 6fdbdcf..6ce755c 100644
--- a/camel/camel.c
+++ b/camel/camel.c
@@ -37,10 +37,10 @@
 
 #include "camel.h"
 #include "camel-certdb.h"
+#include "camel-debug.h"
 #include "camel-i18n.h"
-#include "camel-mime-utils.h"
 #include "camel-provider.h"
-#include "camel-debug.h"
+#include "camel-private.h"
 
 static int initialised = FALSE;
 
@@ -52,7 +52,10 @@ camel_shutdown (void)
 	if (!initialised)
 		return;
 	
-#ifdef HAVE_NSS
+#if defined (HAVE_NSS) && !defined (G_OS_WIN32)
+	/* For some reason we get into trouble on Win32 if we call these.
+	 * But they shouldn't be necessary as the process is exiting anywy?
+	 */
 	NSS_Shutdown ();
 	
 	PR_Cleanup ();
-- 
2.7.4