summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/debug.c4
-rw-r--r--lib/x509/common.c2
-rw-r--r--lib/x509/crl.c2
-rw-r--r--lib/x509/dn.c2
-rw-r--r--lib/x509/pkcs12.c2
-rw-r--r--lib/x509/pkcs7.c2
-rw-r--r--libextra/openssl_compat.c2
-rw-r--r--src/serv.c5
8 files changed, 11 insertions, 10 deletions
diff --git a/lib/debug.c b/lib/debug.c
index a9f18d0c11..ee2e220f86 100644
--- a/lib/debug.c
+++ b/lib/debug.c
@@ -22,10 +22,10 @@
*
*/
-#include <stdio.h>
-#include <stdlib.h>
#include "gnutls_int.h"
#include "gnutls_errors.h"
+#include <stdio.h>
+#include <stdlib.h>
#include <gcrypt.h>
#ifdef DEBUG
diff --git a/lib/x509/common.c b/lib/x509/common.c
index ae707c2afc..c361e79b3f 100644
--- a/lib/x509/common.c
+++ b/lib/x509/common.c
@@ -22,8 +22,8 @@
*
*/
-#include <libtasn1.h>
#include <gnutls_int.h>
+#include <libtasn1.h>
#include <gnutls_datum.h>
#include <gnutls_global.h>
#include <gnutls_errors.h>
diff --git a/lib/x509/crl.c b/lib/x509/crl.c
index 3fd0431dbf..249848e4a4 100644
--- a/lib/x509/crl.c
+++ b/lib/x509/crl.c
@@ -22,8 +22,8 @@
*
*/
-#include <libtasn1.h>
#include <gnutls_int.h>
+#include <libtasn1.h>
#ifdef ENABLE_PKI
diff --git a/lib/x509/dn.c b/lib/x509/dn.c
index c8b28c5fb3..819e369900 100644
--- a/lib/x509/dn.c
+++ b/lib/x509/dn.c
@@ -22,8 +22,8 @@
*
*/
-#include <libtasn1.h>
#include <gnutls_int.h>
+#include <libtasn1.h>
#include <gnutls_datum.h>
#include <gnutls_global.h>
#include <gnutls_errors.h>
diff --git a/lib/x509/pkcs12.c b/lib/x509/pkcs12.c
index 78de1c24c1..a1abbc0b4e 100644
--- a/lib/x509/pkcs12.c
+++ b/lib/x509/pkcs12.c
@@ -25,8 +25,8 @@
/* Functions that relate on PKCS12 packet parsing.
*/
-#include <libtasn1.h>
#include <gnutls_int.h>
+#include <libtasn1.h>
#ifdef ENABLE_PKI
diff --git a/lib/x509/pkcs7.c b/lib/x509/pkcs7.c
index 6a915bef6b..a73d1909bc 100644
--- a/lib/x509/pkcs7.c
+++ b/lib/x509/pkcs7.c
@@ -25,8 +25,8 @@
/* Functions that relate on PKCS7 certificate lists parsing.
*/
-#include <libtasn1.h>
#include <gnutls_int.h>
+#include <libtasn1.h>
#ifdef ENABLE_PKI
diff --git a/libextra/openssl_compat.c b/libextra/openssl_compat.c
index 6e4ce9a738..f28c84d2b1 100644
--- a/libextra/openssl_compat.c
+++ b/libextra/openssl_compat.c
@@ -27,6 +27,8 @@
* API.
*/
+#include <config.h>
+
#include <gnutls_global.h>
#include <gnutls_errors.h>
#include <string.h> /* memset */
diff --git a/src/serv.c b/src/serv.c
index a547ea0f99..83ceb7b965 100644
--- a/src/serv.c
+++ b/src/serv.c
@@ -24,6 +24,8 @@
* (which means it is quite unreadable)
*/
+#include "common.h"
+#include "serv-gaa.h"
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
@@ -31,11 +33,8 @@
#include <string.h>
#include <gnutls/gnutls.h>
#include <gnutls/extra.h>
-#include "common.h"
-#include "serv-gaa.h"
#include <sys/time.h>
#include <fcntl.h>
-#include <config.h>
#include <list.h>
/* konqueror cannot handle sending the page in multiple