Author: brane
Date: Sat Jan 10 03:47:38 2026
New Revision: 1931208
Log:
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.
Modified:
serf/trunk/auth/auth.h
serf/trunk/auth/auth_basic.c
serf/trunk/auth/auth_digest.c
serf/trunk/auth/auth_spnego.c
serf/trunk/auth/auth_spnego.h
serf/trunk/auth/auth_spnego_sspi.c
serf/trunk/auth/auth_user_defined.c
serf/trunk/buckets/allocator.c
serf/trunk/buckets/brotli_buckets.c
serf/trunk/buckets/buckets.c
serf/trunk/buckets/bwtp_buckets.c
serf/trunk/buckets/copy_buckets.c
serf/trunk/buckets/limit_buckets.c
serf/trunk/buckets/log_wrapper_buckets.c
serf/trunk/buckets/request_buckets.c
serf/trunk/buckets/socket_buckets.c
serf/trunk/buckets/ssl_buckets.c
serf/trunk/protocols/fcgi_buckets.h
serf/trunk/protocols/fcgi_protocol.c
serf/trunk/protocols/fcgi_protocol.h
serf/trunk/protocols/fcgi_stream.c
serf/trunk/protocols/http2_buckets.h
serf/trunk/protocols/http2_protocol.c
serf/trunk/protocols/http2_stream.c
serf/trunk/serf_private.h
serf/trunk/src/config_store.c
serf/trunk/src/context.c
serf/trunk/src/deprecated.c
serf/trunk/src/incoming.c
serf/trunk/src/inet_pton.c
serf/trunk/src/init_once.c
serf/trunk/src/outgoing.c
serf/trunk/src/pump.c
serf/trunk/src/syntax.c
serf/trunk/test/mock_buckets.c
serf/trunk/test/mock_sock_buckets.c
serf/trunk/test/test_auth.c
serf/trunk/test/test_buckets.c
serf/trunk/test/test_internal.c
serf/trunk/test/test_serf.h
serf/trunk/test/test_ssl.c
serf/trunk/test/test_util.c
Modified: serf/trunk/auth/auth.h
==============================================================================
--- serf/trunk/auth/auth.h Fri Jan 9 23:29:38 2026 (r1931207)
+++ serf/trunk/auth/auth.h Sat Jan 10 03:47:38 2026 (r1931208)
@@ -21,7 +21,7 @@
#ifndef AUTH_H
#define AUTH_H
-#include "auth_spnego.h"
+#include "serf_private.h"
#ifdef __cplusplus
extern "C" {
Modified: serf/trunk/auth/auth_basic.c
==============================================================================
--- serf/trunk/auth/auth_basic.c Fri Jan 9 23:29:38 2026
(r1931207)
+++ serf/trunk/auth/auth_basic.c Sat Jan 10 03:47:38 2026
(r1931208)
@@ -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 {
Modified: serf/trunk/auth/auth_digest.c
==============================================================================
--- serf/trunk/auth/auth_digest.c Fri Jan 9 23:29:38 2026
(r1931207)
+++ serf/trunk/auth/auth_digest.c Sat Jan 10 03:47:38 2026
(r1931208)
@@ -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
Modified: serf/trunk/auth/auth_spnego.c
==============================================================================
--- serf/trunk/auth/auth_spnego.c Fri Jan 9 23:29:38 2026
(r1931207)
+++ serf/trunk/auth/auth_spnego.c Sat Jan 10 03:47:38 2026
(r1931208)
@@ -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.
Modified: serf/trunk/auth/auth_spnego.h
==============================================================================
--- serf/trunk/auth/auth_spnego.h Fri Jan 9 23:29:38 2026
(r1931207)
+++ serf/trunk/auth/auth_spnego.h Sat Jan 10 03:47:38 2026
(r1931208)
@@ -23,6 +23,7 @@
#include <apr.h>
#include <apr_pools.h>
+
#include "serf.h"
#include "serf_private.h"
Modified: serf/trunk/auth/auth_spnego_sspi.c
==============================================================================
--- serf/trunk/auth/auth_spnego_sspi.c Fri Jan 9 23:29:38 2026
(r1931207)
+++ serf/trunk/auth/auth_spnego_sspi.c Sat Jan 10 03:47:38 2026
(r1931208)
@@ -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>
Modified: serf/trunk/auth/auth_user_defined.c
==============================================================================
--- serf/trunk/auth/auth_user_defined.c Fri Jan 9 23:29:38 2026
(r1931207)
+++ serf/trunk/auth/auth_user_defined.c Sat Jan 10 03:47:38 2026
(r1931208)
@@ -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"
Modified: serf/trunk/buckets/allocator.c
==============================================================================
--- serf/trunk/buckets/allocator.c Fri Jan 9 23:29:38 2026
(r1931207)
+++ serf/trunk/buckets/allocator.c Sat Jan 10 03:47:38 2026
(r1931208)
@@ -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
}
-
Modified: serf/trunk/buckets/brotli_buckets.c
==============================================================================
--- serf/trunk/buckets/brotli_buckets.c Fri Jan 9 23:29:38 2026
(r1931207)
+++ serf/trunk/buckets/brotli_buckets.c Sat Jan 10 03:47:38 2026
(r1931208)
@@ -20,7 +20,7 @@
#include "serf.h"
#include "serf_bucket_util.h"
-#include "serf_private.h"
+
#ifdef SERF_HAVE_BROTLI
Modified: serf/trunk/buckets/buckets.c
==============================================================================
--- serf/trunk/buckets/buckets.c Fri Jan 9 23:29:38 2026
(r1931207)
+++ serf/trunk/buckets/buckets.c Sat Jan 10 03:47:38 2026
(r1931208)
@@ -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,
Modified: serf/trunk/buckets/bwtp_buckets.c
==============================================================================
--- serf/trunk/buckets/bwtp_buckets.c Fri Jan 9 23:29:38 2026
(r1931207)
+++ serf/trunk/buckets/bwtp_buckets.c Sat Jan 10 03:47:38 2026
(r1931208)
@@ -18,6 +18,8 @@
* ====================================================================
*/
+#include <stdlib.h>
+
#include <apr_pools.h>
#include <apr_strings.h>
#include <apr_lib.h>
@@ -28,7 +30,6 @@
#include "serf_bucket_types.h"
#include "serf_private.h"
-#include <stdlib.h>
/* This is an implementation of Bidirectional Web Transfer Protocol (BWTP)
* See:
Modified: serf/trunk/buckets/copy_buckets.c
==============================================================================
--- serf/trunk/buckets/copy_buckets.c Fri Jan 9 23:29:38 2026
(r1931207)
+++ serf/trunk/buckets/copy_buckets.c Sat Jan 10 03:47:38 2026
(r1931208)
@@ -21,8 +21,8 @@
#include <apr_pools.h>
#include "serf.h"
-#include "serf_private.h"
#include "serf_bucket_util.h"
+#include "serf_private.h"
#define IOVEC_HOLD_COUNT 16
Modified: serf/trunk/buckets/limit_buckets.c
==============================================================================
--- serf/trunk/buckets/limit_buckets.c Fri Jan 9 23:29:38 2026
(r1931207)
+++ serf/trunk/buckets/limit_buckets.c Sat Jan 10 03:47:38 2026
(r1931208)
@@ -22,7 +22,7 @@
#include "serf.h"
#include "serf_bucket_util.h"
-#include "serf_private.h"
+
typedef struct limit_context_t {
serf_bucket_t *stream;
Modified: serf/trunk/buckets/log_wrapper_buckets.c
==============================================================================
--- serf/trunk/buckets/log_wrapper_buckets.c Fri Jan 9 23:29:38 2026
(r1931207)
+++ serf/trunk/buckets/log_wrapper_buckets.c Sat Jan 10 03:47:38 2026
(r1931208)
@@ -19,8 +19,9 @@
*/
#include "serf.h"
-#include "serf_private.h"
#include "serf_bucket_util.h"
+#include "serf_private.h"
+
/* TODO: don't use SOCK[_MSG]_VERBOSE directly, but get a log category in
from the config object. */
Modified: serf/trunk/buckets/request_buckets.c
==============================================================================
--- serf/trunk/buckets/request_buckets.c Fri Jan 9 23:29:38 2026
(r1931207)
+++ serf/trunk/buckets/request_buckets.c Sat Jan 10 03:47:38 2026
(r1931208)
@@ -24,9 +24,9 @@
#include "serf.h"
#include "serf_bucket_util.h"
-
#include "serf_private.h"
+
typedef struct request_context_t {
const char *method;
const char *uri;
Modified: serf/trunk/buckets/socket_buckets.c
==============================================================================
--- serf/trunk/buckets/socket_buckets.c Fri Jan 9 23:29:38 2026
(r1931207)
+++ serf/trunk/buckets/socket_buckets.c Sat Jan 10 03:47:38 2026
(r1931208)
@@ -22,7 +22,6 @@
#include <apr_network_io.h>
#include "serf.h"
-#include "serf_private.h"
#include "serf_bucket_util.h"
Modified: serf/trunk/buckets/ssl_buckets.c
==============================================================================
--- serf/trunk/buckets/ssl_buckets.c Fri Jan 9 23:29:38 2026
(r1931207)
+++ serf/trunk/buckets/ssl_buckets.c Sat Jan 10 03:47:38 2026
(r1931208)
@@ -32,10 +32,6 @@
#include <apr_version.h>
#include <apr_atomic.h>
-#include "serf.h"
-#include "serf_private.h"
-#include "serf_bucket_util.h"
-
#include <openssl/bio.h>
#include <openssl/ssl.h>
#include <openssl/err.h>
@@ -54,6 +50,10 @@ DEFINE_STACK_OF(EVP_PKEY)
#endif
#endif
+#include "serf.h"
+#include "serf_private.h"
+#include "serf_bucket_util.h"
+
#ifndef APR_ARRAY_PUSH
#define APR_ARRAY_PUSH(ary,type) (*((type *)apr_array_push(ary)))
#endif
Modified: serf/trunk/protocols/fcgi_buckets.h
==============================================================================
--- serf/trunk/protocols/fcgi_buckets.h Fri Jan 9 23:29:38 2026
(r1931207)
+++ serf/trunk/protocols/fcgi_buckets.h Sat Jan 10 03:47:38 2026
(r1931208)
@@ -22,6 +22,7 @@
#define SERF_PROTOCOL_FCGI_BUCKETS_H
#include "serf_bucket_types.h"
+#include "serf_private.h"
#ifdef __cplusplus
extern "C" {
@@ -92,4 +93,3 @@ serf__bucket_fcgi_frame_create(serf_buck
#endif
#endif /* !SERF_PROTOCOL_FCGI_BUCKETS_H */
-
Modified: serf/trunk/protocols/fcgi_protocol.c
==============================================================================
--- serf/trunk/protocols/fcgi_protocol.c Fri Jan 9 23:29:38 2026
(r1931207)
+++ serf/trunk/protocols/fcgi_protocol.c Sat Jan 10 03:47:38 2026
(r1931208)
@@ -25,11 +25,10 @@
#include <apr_strings.h>
#include "serf.h"
-#include "serf_bucket_util.h"
#include "serf_private.h"
-#include "protocols/fcgi_buckets.h"
-#include "protocols/fcgi_protocol.h"
+#include "fcgi_buckets.h"
+#include "fcgi_protocol.h"
#define SERF_ERROR_FCGI_RECORD_SIZE_ERROR SERF_ERROR_HTTP2_FRAME_SIZE_ERROR
#define SERF_ERROR_FCGI_PROTOCOL_ERROR SERF_ERROR_HTTP2_PROTOCOL_ERROR
Modified: serf/trunk/protocols/fcgi_protocol.h
==============================================================================
--- serf/trunk/protocols/fcgi_protocol.h Fri Jan 9 23:29:38 2026
(r1931207)
+++ serf/trunk/protocols/fcgi_protocol.h Sat Jan 10 03:47:38 2026
(r1931208)
@@ -22,6 +22,7 @@
#define SERF_PROTOCOL_FCGI_PROTOCOL_H
#include "serf_bucket_types.h"
+#include "serf_private.h"
#ifdef _DEBUG
#include <assert.h>
@@ -226,5 +227,3 @@ void serf_fcgi__stream_destroy(serf_fcgi
#endif
#endif /* !SERF_PROTOCOL_FCGI_PROTOCOL_H */
-
-
Modified: serf/trunk/protocols/fcgi_stream.c
==============================================================================
--- serf/trunk/protocols/fcgi_stream.c Fri Jan 9 23:29:38 2026
(r1931207)
+++ serf/trunk/protocols/fcgi_stream.c Sat Jan 10 03:47:38 2026
(r1931208)
@@ -28,8 +28,8 @@
#include "serf_bucket_util.h"
#include "serf_private.h"
-#include "protocols/fcgi_buckets.h"
-#include "protocols/fcgi_protocol.h"
+#include "fcgi_buckets.h"
+#include "fcgi_protocol.h"
/* Fully opaque variant of serf_fcgi_stream_t */
struct serf_fcgi_stream_data_t
@@ -350,4 +350,3 @@ apr_status_t serf_fcgi__stream_processor
return status;
}
-
Modified: serf/trunk/protocols/http2_buckets.h
==============================================================================
--- serf/trunk/protocols/http2_buckets.h Fri Jan 9 23:29:38 2026
(r1931207)
+++ serf/trunk/protocols/http2_buckets.h Sat Jan 10 03:47:38 2026
(r1931208)
@@ -22,6 +22,7 @@
#define SERF_PROTOCOL_HTTP2_BUCKETS_H
#include "serf_bucket_types.h"
+#include "serf_private.h"
/**
* @file serf_bucket_types.h
@@ -212,4 +213,3 @@ serf__bucket_http2_frame_create(serf_buc
#endif
#endif /* !SERF_PROTOCOL_HTTP2_BUCKETS_H */
-
Modified: serf/trunk/protocols/http2_protocol.c
==============================================================================
--- serf/trunk/protocols/http2_protocol.c Fri Jan 9 23:29:38 2026
(r1931207)
+++ serf/trunk/protocols/http2_protocol.c Sat Jan 10 03:47:38 2026
(r1931208)
@@ -28,8 +28,8 @@
#include "serf_bucket_util.h"
#include "serf_private.h"
-#include "protocols/http2_buckets.h"
-#include "protocols/http2_protocol.h"
+#include "http2_buckets.h"
+#include "http2_protocol.h"
static apr_status_t
http2_outgoing_read(serf_connection_t *conn);
Modified: serf/trunk/protocols/http2_stream.c
==============================================================================
--- serf/trunk/protocols/http2_stream.c Fri Jan 9 23:29:38 2026
(r1931207)
+++ serf/trunk/protocols/http2_stream.c Sat Jan 10 03:47:38 2026
(r1931208)
@@ -27,8 +27,8 @@
#include "serf_bucket_util.h"
#include "serf_private.h"
-#include "protocols/http2_buckets.h"
-#include "protocols/http2_protocol.h"
+#include "http2_buckets.h"
+#include "http2_protocol.h"
struct serf_http2_stream_data_t
{
Modified: serf/trunk/serf_private.h
==============================================================================
--- serf/trunk/serf_private.h Fri Jan 9 23:29:38 2026 (r1931207)
+++ serf/trunk/serf_private.h Sat Jan 10 03:47:38 2026 (r1931208)
@@ -21,6 +21,8 @@
#ifndef _SERF_PRIVATE_H_
#define _SERF_PRIVATE_H_
+#include "serf.h"
+
#if !defined(HAVE_STDBOOL_H) && defined(_MSC_VER) && (_MSC_VER >= 1800)
/* VS 2015 errors out when redefining bool */
#define HAVE_STDBOOL_H 1
@@ -1036,4 +1038,4 @@ serf_bucket_t *serf__bucket_event_create
serf_bucket_alloc_t *allocator);
-#endif
+#endif /* _SERF_PRIVATE_H_ */
Modified: serf/trunk/src/config_store.c
==============================================================================
--- serf/trunk/src/config_store.c Fri Jan 9 23:29:38 2026
(r1931207)
+++ serf/trunk/src/config_store.c Sat Jan 10 03:47:38 2026
(r1931208)
@@ -22,8 +22,10 @@
#include "serf.h"
#include "serf_bucket_util.h"
+
#include "serf_private.h"
+
/* Use a linked list to store the config values, as we'll only store a couple
of values per context. */
struct serf__config_hdr_t {
Modified: serf/trunk/src/context.c
==============================================================================
--- serf/trunk/src/context.c Fri Jan 9 23:29:38 2026 (r1931207)
+++ serf/trunk/src/context.c Sat Jan 10 03:47:38 2026 (r1931208)
@@ -24,8 +24,6 @@
#include <apr_version.h>
#include "serf.h"
-#include "serf_bucket_util.h"
-
#include "serf_private.h"
Modified: serf/trunk/src/deprecated.c
==============================================================================
--- serf/trunk/src/deprecated.c Fri Jan 9 23:29:38 2026 (r1931207)
+++ serf/trunk/src/deprecated.c Sat Jan 10 03:47:38 2026 (r1931208)
@@ -21,7 +21,7 @@
#include <apr_pools.h>
#include "serf.h"
-#include "serf_bucket_util.h"
+
#include "serf_private.h"
Modified: serf/trunk/src/incoming.c
==============================================================================
--- serf/trunk/src/incoming.c Fri Jan 9 23:29:38 2026 (r1931207)
+++ serf/trunk/src/incoming.c Sat Jan 10 03:47:38 2026 (r1931208)
@@ -28,6 +28,7 @@
#include "serf_private.h"
+
static apr_status_t client_connected(serf_incoming_t *client)
{
/* serf_context_t *ctx = client->ctx; */
Modified: serf/trunk/src/inet_pton.c
==============================================================================
--- serf/trunk/src/inet_pton.c Fri Jan 9 23:29:38 2026 (r1931207)
+++ serf/trunk/src/inet_pton.c Sat Jan 10 03:47:38 2026 (r1931208)
@@ -34,7 +34,6 @@
#include <errno.h>
#endif
-#include "serf.h"
#include "serf_private.h"
#ifndef IN6ADDRSZ
Modified: serf/trunk/src/init_once.c
==============================================================================
--- serf/trunk/src/init_once.c Fri Jan 9 23:29:38 2026 (r1931207)
+++ serf/trunk/src/init_once.c Sat Jan 10 03:47:38 2026 (r1931208)
@@ -29,7 +29,6 @@
# endif
#endif
-#include "serf.h"
#include "serf_private.h"
Modified: serf/trunk/src/outgoing.c
==============================================================================
--- serf/trunk/src/outgoing.c Fri Jan 9 23:29:38 2026 (r1931207)
+++ serf/trunk/src/outgoing.c Sat Jan 10 03:47:38 2026 (r1931208)
@@ -25,10 +25,9 @@
#include <apr_strings.h>
#include "serf.h"
-#include "serf_bucket_util.h"
-
#include "serf_private.h"
+
/* forward definitions */
static apr_status_t read_from_connection(serf_connection_t *conn);
static apr_status_t write_to_connection(serf_connection_t *conn);
Modified: serf/trunk/src/pump.c
==============================================================================
--- serf/trunk/src/pump.c Fri Jan 9 23:29:38 2026 (r1931207)
+++ serf/trunk/src/pump.c Sat Jan 10 03:47:38 2026 (r1931208)
@@ -25,10 +25,9 @@
#include <apr_strings.h>
#include "serf.h"
-#include "serf_bucket_util.h"
-
#include "serf_private.h"
+
static apr_status_t pump_cleanup(void *baton)
{
serf_pump_t *pump = baton;
@@ -401,4 +400,3 @@ apr_status_t serf_pump__add_output(serf_
else
return APR_SUCCESS;
}
-
Modified: serf/trunk/src/syntax.c
==============================================================================
--- serf/trunk/src/syntax.c Fri Jan 9 23:29:38 2026 (r1931207)
+++ serf/trunk/src/syntax.c Sat Jan 10 03:47:38 2026 (r1931208)
@@ -25,7 +25,6 @@
#define APR_WANT_STRFUNC
#include <apr_want.h>
-#include "serf.h"
#include "serf_private.h"
Modified: serf/trunk/test/mock_buckets.c
==============================================================================
--- serf/trunk/test/mock_buckets.c Fri Jan 9 23:29:38 2026
(r1931207)
+++ serf/trunk/test/mock_buckets.c Sat Jan 10 03:47:38 2026
(r1931208)
@@ -22,6 +22,7 @@
#include "serf.h"
#include "serf_bucket_util.h"
+
#include "test_serf.h"
/* This bucket uses a list of count - data/len - status actions (provided by
the
Modified: serf/trunk/test/mock_sock_buckets.c
==============================================================================
--- serf/trunk/test/mock_sock_buckets.c Fri Jan 9 23:29:38 2026
(r1931207)
+++ serf/trunk/test/mock_sock_buckets.c Sat Jan 10 03:47:38 2026
(r1931208)
@@ -21,7 +21,7 @@
#include "serf.h"
#include "serf_bucket_util.h"
-#include "test/test_serf.h"
+#include "test_serf.h"
typedef struct mock_sock_context_t {
apr_status_t eof_status;
Modified: serf/trunk/test/test_auth.c
==============================================================================
--- serf/trunk/test/test_auth.c Fri Jan 9 23:29:38 2026 (r1931207)
+++ serf/trunk/test/test_auth.c Sat Jan 10 03:47:38 2026 (r1931208)
@@ -21,6 +21,7 @@
#include <apr_strings.h>
#include "serf.h"
+
#include "test_serf.h"
static apr_status_t
Modified: serf/trunk/test/test_buckets.c
==============================================================================
--- serf/trunk/test/test_buckets.c Fri Jan 9 23:29:38 2026
(r1931207)
+++ serf/trunk/test/test_buckets.c Sat Jan 10 03:47:38 2026
(r1931208)
@@ -27,14 +27,14 @@
#include <zlib.h>
#include "serf.h"
-#include "test_serf.h"
+#include "serf_bucket_util.h"
/* test case has access to internal functions. */
#include "serf_private.h"
-#include "serf_bucket_util.h"
-
#include "protocols/http2_buckets.h"
+#include "test_serf.h"
+
#ifdef SERF_DEBUG_BUCKET_USE
#define DRAIN_BUCKET(b) serf__bucket_drain(b)
#else
Modified: serf/trunk/test/test_internal.c
==============================================================================
--- serf/trunk/test/test_internal.c Fri Jan 9 23:29:38 2026
(r1931207)
+++ serf/trunk/test/test_internal.c Sat Jan 10 03:47:38 2026
(r1931208)
@@ -29,12 +29,12 @@
#include "serf.h"
-#include "test_serf.h"
/* These test cases have access to internal functions. */
#define SERF__TEST_INTERNAL /* Disable SERF__CONV_assert() */
#include "serf_private.h"
-#include "serf_bucket_util.h"
+
+#include "test_serf.h"
#define PER_CONN_UNKNOWN_KEY SERF_CONFIG_PER_CONNECTION | 0xFF0001
/* #define PER_HOST_UNKNOWN_KEY SERF_CONFIG_PER_HOST | 0xFF0002 */
Modified: serf/trunk/test/test_serf.h
==============================================================================
--- serf/trunk/test/test_serf.h Fri Jan 9 23:29:38 2026 (r1931207)
+++ serf/trunk/test/test_serf.h Sat Jan 10 03:47:38 2026 (r1931208)
@@ -21,14 +21,13 @@
#ifndef TEST_SERF_H
#define TEST_SERF_H
-#include "CuTest.h"
-
#include <apr.h>
#include <apr_pools.h>
#include <apr_uri.h>
#include "serf.h"
+#include "CuTest.h"
#include "MockHTTPinC/MockHTTP.h"
/* Test logging facilities, set flag to 1 to enable console logging for
Modified: serf/trunk/test/test_ssl.c
==============================================================================
--- serf/trunk/test/test_ssl.c Fri Jan 9 23:29:38 2026 (r1931207)
+++ serf/trunk/test/test_ssl.c Sat Jan 10 03:47:38 2026 (r1931208)
@@ -24,11 +24,6 @@
#include <apr_env.h>
#include <apr_md5.h>
-#include "serf.h"
-#include "serf_bucket_types.h"
-
-#include "test_serf.h"
-
#include <openssl/ssl.h>
#include <openssl/x509v3.h>
#include <openssl/opensslv.h>
@@ -36,6 +31,11 @@
#include <openssl/ocsp.h>
#endif
+#include "serf.h"
+#include "serf_bucket_types.h"
+
+#include "test_serf.h"
+
/* The OPENSSL_VERSION_PREREQ macro is only available from 3.0 onwards,
so we'll "backport" it here for older versions. */
#ifdef OPENSSL_VERSION_PREREQ
Modified: serf/trunk/test/test_util.c
==============================================================================
--- serf/trunk/test/test_util.c Fri Jan 9 23:29:38 2026 (r1931207)
+++ serf/trunk/test/test_util.c Sat Jan 10 03:47:38 2026 (r1931208)
@@ -18,13 +18,6 @@
* ====================================================================
*/
-#define APR_WANT_MEMFUNC
-#include <apr_want.h>
-#include "apr.h"
-#include "apr_pools.h"
-#include <apr_strings.h>
-#include "apr_env.h"
-
#include <stdlib.h>
#ifdef WIN32
@@ -36,6 +29,13 @@
#define isatty(x) 0
#endif
+#define APR_WANT_MEMFUNC
+#include <apr_want.h>
+#include "apr.h"
+#include "apr_pools.h"
+#include <apr_strings.h>
+#include "apr_env.h"
+
#include "serf.h"
#include "test_serf.h"
