Make #include directives more consistent throughout the code.

Standard and system headers go first, dependency next, then
our public headers and finally our private headers. Make the
use of #include <header> vs. #include "header" semantically
correct and consistent, too. Also:

* serf_private.h: Include serf.h because of all the typedefs.
* auth/auth.h: Remove unused include of auth_spnego.h and
   include the needed serf_private.h.
* auth/auth_spnego.c: Remove headers that are alread included
   in auth_spnego.h.
* buckets/allocator.c,
  buckets/brotli_buckets.c,
  buckets/limit_buckets.c,
  buckets/socket_buckets.c: Don't include serf_private.h.
* protocols/fcgi_buckets.h,
  protocols/fcgi_protocol.h,
  protocols/http2_buckets.h: Do include serf_private.h.
* protocols/fcgi_protocol.c: Don't include serf_bucket_util.h.
* src/context.c,
  src/deprecated.c,
  src/outgoing.c,
  src/pump.c: Don't include serf_bucket_util.h.
* src/inet_pton.c,
  src/init_once.c,
  src/syntax.c: Don't include serf.h.
* test/test_internal.c: Don't include serf_bucket_util.h.



git-svn-id: https://svn.apache.org/repos/asf/serf/trunk@1931208 13f79535-47bb-0310-9956-ffa450edef68

Author: brainy

auth/auth.h

@@ -21,7 +21,7 @@
 #ifndef AUTH_H
 #define AUTH_H
 
-#include "auth_spnego.h"
+#include "serf_private.h"
 
 #ifdef __cplusplus
 extern "C" {

auth/auth_basic.c

@@ -20,14 +20,14 @@
 
 /*** Basic authentication ***/
 
-#include <serf.h>
-#include <serf_private.h>
-#include <auth/auth.h>
-
 #include <apr.h>
 #include <apr_base64.h>
 #include <apr_strings.h>
 
+#include "serf.h"
+#include "serf_private.h"
+#include "auth.h"
+
 /* Stores the context information related to Basic authentication.
    This information is stored in the per server cache in the serf context. */
 typedef struct basic_authn_info_t {

auth/auth_digest.c

@@ -20,16 +20,16 @@
 
 /*** Digest authentication ***/
 
-#include <serf.h>
-#include <serf_private.h>
-#include <auth/auth.h>
-
 #include <apr.h>
 #include <apr_base64.h>
 #include <apr_strings.h>
 #include <apr_uuid.h>
 #include <apr_md5.h>
 
+#include "serf.h"
+#include "serf_private.h"
+#include "auth.h"
+
 /** Digest authentication, implements RFC 2617. **/
 
 /* TODO: add support for the domain attribute. This defines the protection

auth/auth_spnego.c

@@ -18,24 +18,20 @@
  * ====================================================================
  */
 
-
 #include "auth_spnego.h"
 
 #ifdef SERF_HAVE_SPNEGO
 
+#include <apr_base64.h>
+#include <apr_strings.h>
+
+#include "auth.h"
+
 /** These functions implement SPNEGO-based Kerberos and NTLM authentication,
  *  using either GSS-API (RFC 2743) or SSPI on Windows.
  *  The HTTP message exchange is documented in RFC 4559.
  **/
 
-#include <serf.h>
-#include <serf_private.h>
-#include <auth/auth.h>
-
-#include <apr.h>
-#include <apr_base64.h>
-#include <apr_strings.h>
-
 /** TODO:
  ** - send session key directly on new connections where we already know
  **   the server requires Kerberos authn.

auth/auth_spnego.h

@@ -23,6 +23,7 @@
 
 #include <apr.h>
 #include <apr_pools.h>
+
 #include "serf.h"
 #include "serf_private.h"
 

auth/auth_spnego_sspi.c

@@ -18,10 +18,10 @@
  * ====================================================================
  */
 
-#include "auth.h"
-#include "auth_spnego.h"
 #include "serf.h"
 #include "serf_private.h"
+#include "auth.h"
+#include "auth_spnego.h"
 
 #ifdef SERF_USE_SSPI
 #include <apr.h>

auth/auth_user_defined.c

@@ -18,10 +18,10 @@
  * ====================================================================
  */
 
-#include <serf.h>
-#include <serf_private.h>
+#include <apr_errno.h>
 
-#include "apr_errno.h"
+#include "serf.h"
+#include "serf_private.h"
 #include "auth.h"
 
 

buckets/allocator.c

@@ -29,7 +29,6 @@
 #include "serf.h"
 #include "serf_bucket_util.h"
 
-#include "serf_private.h"
 
 /* Define SERF__DEBUG_UNFREED_MEMORY if you're interested in tracking
  * unfreed blocks on pool cleanup. */
@@ -535,4 +534,3 @@ void serf_debug__bucket_alloc_check(
     }
 #endif
 }
-

buckets/brotli_buckets.c

@@ -20,7 +20,7 @@
 
 #include "serf.h"
 #include "serf_bucket_util.h"
-#include "serf_private.h"
+
 
 #ifdef SERF_HAVE_BROTLI
 

buckets/buckets.c

@@ -22,13 +22,13 @@
 
 #define APR_WANT_MEMFUNC
 #include <apr_want.h>
-
 #include <apr_pools.h>
 
 #include "serf.h"
 #include "serf_bucket_util.h"
 #include "serf_private.h"
 
+
 serf_bucket_t *serf_bucket_create(
     const serf_bucket_type_t *type,
     serf_bucket_alloc_t *allocator,