[evolution-patches] Cosmetic camel diff

[Tor Lillqvist <tml novell com>]

At some point I did some purely cosmetic changes of the #includes in the
camel sources... I find it visually distracting when #include statements
are in random order, and include headers from the same directory
randomly with <> or "", and with or without a directory name... In this
patch the includes are harmonised to have system headers first, then
headers from other GNOME libraries, then headers from other parts of
e-d-s, and finally headers from camel itself, included without any
directory name. 

--tml

Index: camel/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/ChangeLog,v
retrieving revision 1.2495
diff -u -1 -r1.2495 ChangeLog
--- camel/ChangeLog	1 Dec 2005 11:50:59 -0000	1.2495
+++ camel/ChangeLog	1 Dec 2005 12:00:31 -0000
@@ -1 +1,41 @@
+2005-12-01  Tor Lillqvist  <tml novell com>
+
+	* camel/camel-index.c
+	* camel/camel-mime-filter-basic.c
+	* camel/camel-mime-filter-charset.c
+	* camel/camel-mime-filter-from.c
+	* camel/camel-mime-filter-index.c
+	* camel/camel-mime-filter-windows.c
+	* camel/camel-mime-filter.c
+	* camel/camel-mime-part-utils.c
+	* camel/camel-multipart-encrypted.c
+	* camel/camel-multipart-signed.c
+	* camel/camel-multipart.c
+	* camel/camel-offline-folder.c
+	* camel/camel-offline-store.c
+	* camel/camel-operation.c
+	* camel/camel-sasl-anonymous.c
+	* camel/camel-sasl-cram-md5.c
+	* camel/camel-sasl-digest-md5.c
+	* camel/camel-sasl-kerberos4.c
+	* camel/camel-sasl-login.c
+	* camel/camel-sasl-ntlm.c
+	* camel/camel-sasl-plain.c
+	* camel/camel-sasl.c
+	* camel/camel-search-private.c
+	* camel/camel-service.c
+	* camel/camel-smime-context.c
+	* camel/camel-store.c
+	* camel/camel-stream-buffer.c
+	* camel/camel-stream-filter.c
+	* camel/camel-stream-process.c
+	* camel/camel-stream.c
+	* camel/camel-transport.c
+	* camel/camel-url-scanner.c
+	* camel/camel-vee-folder.c
+	* camel/camel-vee-summary.c
+	* camel/camel-vtrash-folder.c
+	* camel/camel.c: Unify header inclusion order and style purely for
+	cosmetic reasons...
+
 2005-12-01  Chenthill Palanisamy  <pchenthill novell com>
Index: camel/camel-index.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-index.c,v
retrieving revision 1.7
diff -u -1 -r1.7 camel-index.c
--- camel/camel-index.c	31 Aug 2005 04:21:56 -0000	1.7
+++ camel/camel-index.c	1 Dec 2005 12:00:32 -0000
@@ -33,3 +33,3 @@
 #include "camel-index.h"
-#include "camel/camel-object.h"
+#include "camel-object.h"
 
Index: camel/camel-mime-filter-basic.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-mime-filter-basic.c,v
retrieving revision 1.21
diff -u -1 -r1.21 camel-mime-filter-basic.c
--- camel/camel-mime-filter-basic.c	31 Aug 2005 04:21:56 -0000	1.21
+++ camel/camel-mime-filter-basic.c	1 Dec 2005 12:00:32 -0000
@@ -21,6 +21,6 @@
 
-#include "camel-mime-filter-basic.h"
+#include <string.h>
 
+#include "camel-mime-filter-basic.h"
 #include "camel-mime-utils.h"
-#include <string.h>
 
Index: camel/camel-mime-filter-charset.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-mime-filter-charset.c,v
retrieving revision 1.32
diff -u -1 -r1.32 camel-mime-filter-charset.c
--- camel/camel-mime-filter-charset.c	31 Aug 2005 04:21:56 -0000	1.32
+++ camel/camel-mime-filter-charset.c	1 Dec 2005 12:00:32 -0000
@@ -29,3 +29,3 @@
 
-#include <libedataserver/e-iconv.h>
+#include "libedataserver/e-iconv.h"
 
Index: camel/camel-mime-filter-from.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-mime-filter-from.c,v
retrieving revision 1.11
diff -u -1 -r1.11 camel-mime-filter-from.c
--- camel/camel-mime-filter-from.c	31 Aug 2005 04:21:56 -0000	1.11
+++ camel/camel-mime-filter-from.c	1 Dec 2005 12:00:32 -0000
@@ -27,2 +27,3 @@
 #include <string.h>
+
 #include "camel-mime-filter-from.h"
Index: camel/camel-mime-filter-index.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-mime-filter-index.c,v
retrieving revision 1.10
diff -u -1 -r1.10 camel-mime-filter-index.c
--- camel/camel-mime-filter-index.c	31 Aug 2005 04:21:56 -0000	1.10
+++ camel/camel-mime-filter-index.c	1 Dec 2005 12:00:32 -0000
@@ -21,3 +21,2 @@
 #include "camel-mime-filter-index.h"
-
 #include "camel-text-index.h"
Index: camel/camel-mime-filter-windows.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-mime-filter-windows.c,v
retrieving revision 1.6
diff -u -1 -r1.6 camel-mime-filter-windows.c
--- camel/camel-mime-filter-windows.c	31 Aug 2005 04:21:56 -0000	1.6
+++ camel/camel-mime-filter-windows.c	1 Dec 2005 12:00:33 -0000
@@ -31,5 +31,4 @@
 
-#include "camel-mime-filter-windows.h"
-
 #include "camel-charset-map.h"
+#include "camel-mime-filter-windows.h"
 
Index: camel/camel-mime-filter.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-mime-filter.c,v
retrieving revision 1.12
diff -u -1 -r1.12 camel-mime-filter.c
--- camel/camel-mime-filter.c	31 Aug 2005 04:21:56 -0000	1.12
+++ camel/camel-mime-filter.c	1 Dec 2005 12:00:33 -0000
@@ -21,2 +21,3 @@
 #include <string.h>
+
 #include "camel-mime-filter.h"
Index: camel/camel-mime-part-utils.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-mime-part-utils.c,v
retrieving revision 1.102
diff -u -1 -r1.102 camel-mime-part-utils.c
--- camel/camel-mime-part-utils.c	31 Aug 2005 04:21:56 -0000	1.102
+++ camel/camel-mime-part-utils.c	1 Dec 2005 12:00:33 -0000
@@ -34,19 +34,19 @@
 
-#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"
 
Index: camel/camel-multipart-encrypted.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-multipart-encrypted.c,v
retrieving revision 1.14
diff -u -1 -r1.14 camel-multipart-encrypted.c
--- camel/camel-multipart-encrypted.c	31 Aug 2005 04:21:56 -0000	1.14
+++ camel/camel-multipart-encrypted.c	1 Dec 2005 12:00:33 -0000
@@ -30,10 +30,10 @@
 
-#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"
 
Index: camel/camel-multipart-signed.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-multipart-signed.c,v
retrieving revision 1.30
diff -u -1 -r1.30 camel-multipart-signed.c
--- camel/camel-multipart-signed.c	31 Aug 2005 04:21:56 -0000	1.30
+++ camel/camel-multipart-signed.c	1 Dec 2005 12:00:33 -0000
@@ -31,3 +31,2 @@
 #include <stdio.h>
-
 #include <string.h>
@@ -35,19 +34,18 @@
 #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"
 
Index: camel/camel-multipart.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-multipart.c,v
retrieving revision 1.62
diff -u -1 -r1.62 camel-multipart.c
--- camel/camel-multipart.c	31 Aug 2005 04:21:56 -0000	1.62
+++ camel/camel-multipart.c	1 Dec 2005 12:00:34 -0000
@@ -33,7 +33,8 @@
 
+#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"
 
Index: camel/camel-offline-folder.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-offline-folder.c,v
retrieving revision 1.9
diff -u -1 -r1.9 camel-offline-folder.c
--- camel/camel-offline-folder.c	31 Aug 2005 04:21:56 -0000	1.9
+++ camel/camel-offline-folder.c	1 Dec 2005 12:00:34 -0000
@@ -27,8 +27,7 @@
 
-#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"
 
Index: camel/camel-offline-store.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-offline-store.c,v
retrieving revision 1.4
diff -u -1 -r1.4 camel-offline-store.c
--- camel/camel-offline-store.c	31 Aug 2005 04:21:56 -0000	1.4
+++ camel/camel-offline-store.c	1 Dec 2005 12:00:34 -0000
@@ -27,8 +27,7 @@
 
-#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"
 
Index: camel/camel-operation.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-operation.c,v
retrieving revision 1.24
diff -u -1 -r1.24 camel-operation.c
--- camel/camel-operation.c	31 Aug 2005 04:21:56 -0000	1.24
+++ camel/camel-operation.c	1 Dec 2005 12:00:34 -0000
@@ -36,4 +36,5 @@
 
-#include "camel-operation.h"
 #include "libedataserver/e-msgport.h"
+
+#include "camel-operation.h"
 
Index: camel/camel-sasl-anonymous.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-sasl-anonymous.c,v
retrieving revision 1.13
diff -u -1 -r1.13 camel-sasl-anonymous.c
--- camel/camel-sasl-anonymous.c	31 Aug 2005 04:21:56 -0000	1.13
+++ camel/camel-sasl-anonymous.c	1 Dec 2005 12:00:35 -0000
@@ -28,6 +28,6 @@
 #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"
 
Index: camel/camel-sasl-cram-md5.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-sasl-cram-md5.c,v
retrieving revision 1.14
diff -u -1 -r1.14 camel-sasl-cram-md5.c
--- camel/camel-sasl-cram-md5.c	31 Aug 2005 04:21:56 -0000	1.14
+++ camel/camel-sasl-cram-md5.c	1 Dec 2005 12:00:35 -0000
@@ -28,7 +28,9 @@
 #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"
 
Index: camel/camel-sasl-digest-md5.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-sasl-digest-md5.c,v
retrieving revision 1.27
diff -u -1 -r1.27 camel-sasl-digest-md5.c
--- camel/camel-sasl-digest-md5.c	31 Aug 2005 04:21:56 -0000	1.27
+++ camel/camel-sasl-digest-md5.c	1 Dec 2005 12:00:35 -0000
@@ -31,11 +31,10 @@
 
-#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"
 
Index: camel/camel-sasl-kerberos4.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-sasl-kerberos4.c,v
retrieving revision 1.14
diff -u -1 -r1.14 camel-sasl-kerberos4.c
--- camel/camel-sasl-kerberos4.c	31 Aug 2005 04:21:56 -0000	1.14
+++ camel/camel-sasl-kerberos4.c	1 Dec 2005 12:00:35 -0000
@@ -36,7 +36,8 @@
 #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"
 
Index: camel/camel-sasl-login.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-sasl-login.c,v
retrieving revision 1.7
diff -u -1 -r1.7 camel-sasl-login.c
--- camel/camel-sasl-login.c	31 Aug 2005 04:21:56 -0000	1.7
+++ camel/camel-sasl-login.c	1 Dec 2005 12:00:36 -0000
@@ -27,5 +27,6 @@
 #include <string.h>
+
+#include "camel-i18n.h"
 #include "camel-sasl-login.h"
 #include "camel-service.h"
-#include "camel-i18n.h"
 
Index: camel/camel-sasl-ntlm.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-sasl-ntlm.c,v
retrieving revision 1.4
diff -u -1 -r1.4 camel-sasl-ntlm.c
--- camel/camel-sasl-ntlm.c	31 Aug 2005 04:21:56 -0000	1.4
+++ camel/camel-sasl-ntlm.c	1 Dec 2005 12:00:36 -0000
@@ -27,4 +27,4 @@
 
-#include "camel-sasl-ntlm.h"
 #include "camel-i18n.h"
+#include "camel-sasl-ntlm.h"
 
Index: camel/camel-sasl-plain.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-sasl-plain.c,v
retrieving revision 1.13
diff -u -1 -r1.13 camel-sasl-plain.c
--- camel/camel-sasl-plain.c	31 Aug 2005 04:21:56 -0000	1.13
+++ camel/camel-sasl-plain.c	1 Dec 2005 12:00:36 -0000
@@ -27,5 +27,6 @@
 #include <string.h>
+
+#include "camel-i18n.h"
 #include "camel-sasl-plain.h"
 #include "camel-service.h"
-#include "camel-i18n.h"
 
Index: camel/camel-sasl.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-sasl.c,v
retrieving revision 1.20
diff -u -1 -r1.20 camel-sasl.c
--- camel/camel-sasl.c	31 Aug 2005 04:21:56 -0000	1.20
+++ camel/camel-sasl.c	1 Dec 2005 12:00:36 -0000
@@ -28,6 +28,4 @@
 #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"
@@ -37,5 +35,7 @@
 #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"
 
Index: camel/camel-search-private.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-search-private.c,v
retrieving revision 1.35
diff -u -1 -r1.35 camel-search-private.c
--- camel/camel-search-private.c	31 Aug 2005 04:21:56 -0000	1.35
+++ camel/camel-search-private.c	1 Dec 2005 12:00:37 -0000
@@ -31,3 +31,2 @@
 
-#include <glib.h>
 #include <sys/types.h>
@@ -38,11 +37,13 @@
 
+#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>
 
Index: camel/camel-service.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-service.c,v
retrieving revision 1.102
diff -u -1 -r1.102 camel-service.c
--- camel/camel-service.c	31 Aug 2005 04:21:56 -0000	1.102
+++ camel/camel-service.c	1 Dec 2005 12:00:37 -0000
@@ -38,8 +38,8 @@
 
-#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"
 
Index: camel/camel-smime-context.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-smime-context.c,v
retrieving revision 1.41
diff -u -1 -r1.41 camel-smime-context.c
--- camel/camel-smime-context.c	31 Aug 2005 04:21:56 -0000	1.41
+++ camel/camel-smime-context.c	1 Dec 2005 12:00:38 -0000
@@ -45,16 +45,14 @@
 
-#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"
 
Index: camel/camel-store.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-store.c,v
retrieving revision 1.171
diff -u -1 -r1.171 camel-store.c
--- camel/camel-store.c	31 Aug 2005 04:21:56 -0000	1.171
+++ camel/camel-store.c	1 Dec 2005 12:00:39 -0000
@@ -34,10 +34,9 @@
 #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"
 
Index: camel/camel-stream-buffer.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-stream-buffer.c,v
retrieving revision 1.28
diff -u -1 -r1.28 camel-stream-buffer.c
--- camel/camel-stream-buffer.c	31 Aug 2005 04:21:56 -0000	1.28
+++ camel/camel-stream-buffer.c	1 Dec 2005 12:00:39 -0000
@@ -32,2 +32,3 @@
 #include <errno.h>
+
 #include "camel-stream-buffer.h"
Index: camel/camel-stream-filter.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-stream-filter.c,v
retrieving revision 1.32
diff -u -1 -r1.32 camel-stream-filter.c
--- camel/camel-stream-filter.c	31 Aug 2005 04:21:56 -0000	1.32
+++ camel/camel-stream-filter.c	1 Dec 2005 12:00:40 -0000
@@ -28,2 +28,3 @@
 #include <string.h>
+
 #include "camel-stream-filter.h"
Index: camel/camel-stream-process.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-stream-process.c,v
retrieving revision 1.5
diff -u -1 -r1.5 camel-stream-process.c
--- camel/camel-stream-process.c	31 Aug 2005 04:21:56 -0000	1.5
+++ camel/camel-stream-process.c	1 Dec 2005 12:00:40 -0000
@@ -41,4 +41,4 @@
 
-#include "camel-stream-process.h"
 #include "camel-file-utils.h"
+#include "camel-stream-process.h"
 
Index: camel/camel-stream.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-stream.c,v
retrieving revision 1.37
diff -u -1 -r1.37 camel-stream.c
--- camel/camel-stream.c	31 Aug 2005 04:21:56 -0000	1.37
+++ camel/camel-stream.c	1 Dec 2005 12:00:40 -0000
@@ -30,2 +30,3 @@
 #include <string.h>
+
 #include "camel-stream.h"
Index: camel/camel-transport.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-transport.c,v
retrieving revision 1.17
diff -u -1 -r1.17 camel-transport.c
--- camel/camel-transport.c	31 Aug 2005 04:21:56 -0000	1.17
+++ camel/camel-transport.c	1 Dec 2005 12:00:40 -0000
@@ -29,3 +29,2 @@
 
-#include "camel-transport.h"
 #include "camel-address.h"
@@ -33,2 +32,3 @@
 #include "camel-private.h"
+#include "camel-transport.h"
 
Index: camel/camel-url-scanner.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-url-scanner.c,v
retrieving revision 1.18
diff -u -1 -r1.18 camel-url-scanner.c
--- camel/camel-url-scanner.c	31 Aug 2005 04:21:56 -0000	1.18
+++ camel/camel-url-scanner.c	1 Dec 2005 12:00:40 -0000
@@ -32,4 +32,5 @@
 #include "libedataserver/e-trie.h"
-#include "camel-utf8.h"
+
 #include "camel-url-scanner.h"
+#include "camel-utf8.h"
 
Index: camel/camel-vee-folder.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-vee-folder.c,v
retrieving revision 1.76
diff -u -1 -r1.76 camel-vee-folder.c
--- camel/camel-vee-folder.c	31 Aug 2005 04:21:56 -0000	1.76
+++ camel/camel-vee-folder.c	1 Dec 2005 12:00:42 -0000
@@ -28,15 +28,2 @@
 
-#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"
@@ -46,2 +33,15 @@
 #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"
+
 
Index: camel/camel-vee-summary.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-vee-summary.c,v
retrieving revision 1.4
diff -u -1 -r1.4 camel-vee-summary.c
--- camel/camel-vee-summary.c	31 Aug 2005 04:21:56 -0000	1.4
+++ camel/camel-vee-summary.c	1 Dec 2005 12:00:42 -0000
@@ -31,4 +31,4 @@
 
-#include "camel-vee-summary.h"
 #include "camel-folder.h"
+#include "camel-vee-summary.h"
 
Index: camel/camel-vtrash-folder.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-vtrash-folder.c,v
retrieving revision 1.21
diff -u -1 -r1.21 camel-vtrash-folder.c
--- camel/camel-vtrash-folder.c	23 Oct 2005 15:44:33 -0000	1.21
+++ camel/camel-vtrash-folder.c	1 Dec 2005 12:00:43 -0000
@@ -25,11 +25,12 @@
 
+#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>
 
Index: camel/camel.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel.c,v
retrieving revision 1.55
diff -u -1 -r1.55 camel.c
--- camel/camel.c	31 Aug 2005 04:21:56 -0000	1.55
+++ camel/camel.c	1 Dec 2005 12:00:43 -0000
@@ -37,4 +37,4 @@
 
-#include "camel.h"
 #include "camel-certdb.h"
+#include "camel-debug.h"
 #include "camel-i18n.h"
@@ -42,3 +42,4 @@
 #include "camel-provider.h"
-#include "camel-debug.h"
+#include "camel-private.h"
+#include "camel.h"
 
@@ -54,3 +55,3 @@
 	
-#ifdef HAVE_NSS
+#if defined (HAVE_NSS) && !defined (G_OS_WIN32)
 	NSS_Shutdown ();