diff -up cups-1.3.7/cups/adminutil.h.headers-compat cups-1.3.7/cups/adminutil.h
--- cups-1.3.7/cups/adminutil.h.headers-compat	2007-07-11 22:46:42.000000000 +0100
+++ cups-1.3.7/cups/adminutil.h	2008-08-05 18:07:03.000000000 +0100
@@ -62,6 +62,12 @@ extern int	cupsAdminExportSamba(const ch
 extern char	*cupsAdminCreateWindowsPPD(http_t *http, const char *dest,
 		                           char *buffer, int bufsize);
 
+extern int	_cupsAdminGetServerSettings(http_t *http,
+			                    int *num_settings,
+		                            cups_option_t **settings);
+extern int	_cupsAdminSetServerSettings(http_t *http,
+		                            int num_settings,
+		                            cups_option_t *settings);
 extern int	cupsAdminGetServerSettings(http_t *http,
 			                   int *num_settings,
 		                           cups_option_t **settings);
diff -up cups-1.3.7/cups/http.h.headers-compat cups-1.3.7/cups/http.h
--- cups-1.3.7/cups/http.h.headers-compat	2007-07-25 18:19:09.000000000 +0100
+++ cups-1.3.7/cups/http.h	2008-08-05 18:06:48.000000000 +0100
@@ -60,6 +60,31 @@ typedef off_t ssize_t;			/* @private@ */
 #    endif /* LOCAL_PEERCRED && !SO_PEERCRED */
 #  endif /* WIN32 */
 
+#  ifdef HAVE_GSSAPI
+#    ifdef HAVE_GSSAPI_GSSAPI_H
+#      include <gssapi/gssapi.h>
+#    endif /* HAVE_GSSAPI_GSSAPI_H */
+#    ifdef HAVE_GSSAPI_GSSAPI_GENERIC_H
+#      include <gssapi/gssapi_generic.h>
+#    endif /* HAVE_GSSAPI_GSSAPI_GENERIC_H */
+#    ifdef HAVE_GSSAPI_GSSAPI_KRB5_H
+#      include <gssapi/gssapi_krb5.h>
+#    endif /* HAVE_GSSAPI_GSSAPI_KRB5_H */
+#    ifdef HAVE_GSSAPI_H
+#      include <gssapi.h>
+#    endif /* HAVE_GSSAPI_H */
+#    ifndef HAVE_GSS_C_NT_HOSTBASED_SERVICE
+#      define GSS_C_NT_HOSTBASED_SERVICE gss_nt_service_name
+#    endif /* !HAVE_GSS_C_NT_HOSTBASED_SERVICE */
+#    ifdef HAVE_KRB5_H
+#      include <krb5.h>
+#    endif /* HAVE_KRB5_H */
+#  endif /* HAVE_GSSAPI */
+
+#  ifdef HAVE_AUTHORIZATION_H
+#    include <Security/Authorization.h>
+#  endif /* HAVE_AUTHORIZATION_H */
+
 /*
  * With GCC 3.0 and higher, we can mark old APIs "deprecated" so you get
  * a warning at compile-time.
@@ -71,6 +96,7 @@ typedef off_t ssize_t;			/* @private@ */
 #    define _HTTP_DEPRECATED
 #  endif /* __GNUC__ && __GNUC__ > 2 */
 
+#include "md5.h"
 
 /*
  * C++ magic...
@@ -322,7 +348,72 @@ typedef struct http_addrlist_s		/**** So
   http_addr_t		addr;		/* Address */
 } http_addrlist_t;
 
-typedef struct _http_s http_t;		/**** HTTP connection type ****/
+typedef struct _http_s			/**** HTTP connection structure. ****/
+{
+ /*
+  * DO NOT ACCESS MEMBERS OF THIS STRUCTURE DIRECTLY; INSTEAD, USE THE
+  * PROVIDED APIS FOR ACCESSING THE VALUES INSTEAD.
+  *
+  * This structure definition will be removed from the public headers in
+  * CUPS 1.3.
+  */
+
+  int			fd;		/* File descriptor for this socket */
+  int			blocking;	/* To block or not to block */
+  int			error;		/* Last error on read */
+  time_t		activity;	/* Time since last read/write */
+  http_state_t		state;		/* State of client */
+  http_status_t		status;		/* Status of last request */
+  http_version_t	version;	/* Protocol version */
+  http_keepalive_t	keep_alive;	/* Keep-alive supported? */
+  struct sockaddr_in	_hostaddr;	/* Address of connected host @deprecated@ */
+  char			hostname[HTTP_MAX_HOST],
+  					/* Name of connected host */
+			fields[HTTP_FIELD_MAX][HTTP_MAX_VALUE];
+					/* Field values */
+  char			*data;		/* Pointer to data buffer */
+  http_encoding_t	data_encoding;	/* Chunked or not */
+  int			_data_remaining;/* Number of bytes left @deprecated@ */
+  int			used;		/* Number of bytes used in buffer */
+  char			buffer[HTTP_MAX_BUFFER];
+					/* Buffer for incoming data */
+  int			auth_type;	/* Authentication in use */
+  _cups_md5_state_t	md5_state;	/* MD5 state */
+  char			nonce[HTTP_MAX_VALUE];
+					/* Nonce value */
+  int			nonce_count;	/* Nonce count */
+  void			*tls;		/* TLS state information */
+  http_encryption_t	encryption;	/* Encryption requirements */
+  /**** New in CUPS 1.1.19 ****/
+  fd_set		*input_set;	/* select() set for httpWait() @deprecated@ */
+  http_status_t		expect;		/* Expect: header @since CUPS 1.1.19@ */
+  char			*cookie;	/* Cookie value(s) @since CUPS 1.1.19@ */
+  /**** New in CUPS 1.1.20 ****/
+  char			_authstring[HTTP_MAX_VALUE],
+					/* Current Authentication value. @deprecated@ */
+			userpass[HTTP_MAX_VALUE];
+					/* Username:password string @since CUPS 1.1.20@ */
+  int			digest_tries;	/* Number of tries for digest auth @since CUPS 1.1.20@ */
+  /**** New in CUPS 1.2 ****/
+  off_t			data_remaining;	/* Number of bytes left @since CUPS 1.2@ */
+  http_addr_t		*hostaddr;	/* Current host address and port @since CUPS 1.2@ */
+  http_addrlist_t	*addrlist;	/* List of valid addresses @since CUPS 1.2@ */
+  char			wbuffer[HTTP_MAX_BUFFER];
+					/* Buffer for outgoing data */
+  int			wused;		/* Write buffer bytes used @since CUPS 1.2@ */
+  /**** New in CUPS 1.3 ****/
+  char			*field_authorization;
+					/* Authorization field @since CUPS 1.3@ */
+  char			*authstring;	/* Current authorization field @since CUPS 1.3 */
+#  ifdef HAVE_GSSAPI
+  gss_OID 		gssmech;	/* Authentication mechanism @since CUPS 1.3@ */
+  gss_ctx_id_t		gssctx;		/* Authentication context @since CUPS 1.3@ */
+  gss_name_t		gssname;	/* Authentication server name @since CUPS 1.3@ */
+#  endif /* HAVE_GSSAPI */
+#  ifdef HAVE_AUTHORIZATION_H
+  AuthorizationRef	auth_ref;	/* Authorization ref */
+#  endif /* HAVE_AUTHORIZATION_H */
+} http_t;				/**** HTTP connection type ****/
 
 
 /*
diff -up cups-1.3.7/cups/http-private.h.headers-compat cups-1.3.7/cups/http-private.h
--- cups-1.3.7/cups/http-private.h.headers-compat	2007-12-19 01:47:57.000000000 +0000
+++ cups-1.3.7/cups/http-private.h	2008-08-05 18:06:48.000000000 +0100
@@ -40,31 +40,6 @@
 #    define closesocket(f) close(f)
 #  endif /* WIN32 */
 
-#  ifdef HAVE_GSSAPI
-#    ifdef HAVE_GSSAPI_GSSAPI_H
-#      include <gssapi/gssapi.h>
-#    endif /* HAVE_GSSAPI_GSSAPI_H */
-#    ifdef HAVE_GSSAPI_GSSAPI_GENERIC_H
-#      include <gssapi/gssapi_generic.h>
-#    endif /* HAVE_GSSAPI_GSSAPI_GENERIC_H */
-#    ifdef HAVE_GSSAPI_GSSAPI_KRB5_H
-#      include <gssapi/gssapi_krb5.h>
-#    endif /* HAVE_GSSAPI_GSSAPI_KRB5_H */
-#    ifdef HAVE_GSSAPI_H
-#      include <gssapi.h>
-#    endif /* HAVE_GSSAPI_H */
-#    ifndef HAVE_GSS_C_NT_HOSTBASED_SERVICE
-#      define GSS_C_NT_HOSTBASED_SERVICE gss_nt_service_name
-#    endif /* !HAVE_GSS_C_NT_HOSTBASED_SERVICE */
-#    ifdef HAVE_KRB5_H
-#      include <krb5.h>
-#    endif /* HAVE_KRB5_H */
-#  endif /* HAVE_GSSAPI */
-
-#  ifdef HAVE_AUTHORIZATION_H
-#    include <Security/Authorization.h>
-#  endif /* HAVE_AUTHORIZATION_H */
-
 #  if defined(__sgi) || (defined(__APPLE__) && !defined(_SOCKLEN_T))
 /*
  * IRIX and MacOS X 10.2.x do not define socklen_t, and in fact use an int instead of
@@ -131,66 +106,6 @@ extern OSStatus	_httpWriteCDSA(SSLConnec
 #  endif /* HAVE_LIBSSL */
 
 
-struct _http_s				/**** HTTP connection structure. ****/
-{
-  int			fd;		/* File descriptor for this socket */
-  int			blocking;	/* To block or not to block */
-  int			error;		/* Last error on read */
-  time_t		activity;	/* Time since last read/write */
-  http_state_t		state;		/* State of client */
-  http_status_t		status;		/* Status of last request */
-  http_version_t	version;	/* Protocol version */
-  http_keepalive_t	keep_alive;	/* Keep-alive supported? */
-  struct sockaddr_in	_hostaddr;	/* Address of connected host @deprecated@ */
-  char			hostname[HTTP_MAX_HOST],
-  					/* Name of connected host */
-			fields[HTTP_FIELD_MAX][HTTP_MAX_VALUE];
-					/* Field values */
-  char			*data;		/* Pointer to data buffer */
-  http_encoding_t	data_encoding;	/* Chunked or not */
-  int			_data_remaining;/* Number of bytes left @deprecated@ */
-  int			used;		/* Number of bytes used in buffer */
-  char			buffer[HTTP_MAX_BUFFER];
-					/* Buffer for incoming data */
-  int			auth_type;	/* Authentication in use */
-  _cups_md5_state_t	md5_state;	/* MD5 state */
-  char			nonce[HTTP_MAX_VALUE];
-					/* Nonce value */
-  int			nonce_count;	/* Nonce count */
-  void			*tls;		/* TLS state information */
-  http_encryption_t	encryption;	/* Encryption requirements */
-  /**** New in CUPS 1.1.19 ****/
-  fd_set		*input_set;	/* select() set for httpWait() @deprecated@ */
-  http_status_t		expect;		/* Expect: header @since CUPS 1.1.19@ */
-  char			*cookie;	/* Cookie value(s) @since CUPS 1.1.19@ */
-  /**** New in CUPS 1.1.20 ****/
-  char			_authstring[HTTP_MAX_VALUE],
-					/* Current Authentication value. @deprecated@ */
-			userpass[HTTP_MAX_VALUE];
-					/* Username:password string @since CUPS 1.1.20@ */
-  int			digest_tries;	/* Number of tries for digest auth @since CUPS 1.1.20@ */
-  /**** New in CUPS 1.2 ****/
-  off_t			data_remaining;	/* Number of bytes left @since CUPS 1.2@ */
-  http_addr_t		*hostaddr;	/* Current host address and port @since CUPS 1.2@ */
-  http_addrlist_t	*addrlist;	/* List of valid addresses @since CUPS 1.2@ */
-  char			wbuffer[HTTP_MAX_BUFFER];
-					/* Buffer for outgoing data */
-  int			wused;		/* Write buffer bytes used @since CUPS 1.2@ */
-  /**** New in CUPS 1.3 ****/
-  char			*field_authorization;
-					/* Authorization field @since CUPS 1.3@ */
-  char			*authstring;	/* Current authorization field @since CUPS 1.3 */
-#  ifdef HAVE_GSSAPI
-  gss_OID 		gssmech;	/* Authentication mechanism @since CUPS 1.3@ */
-  gss_ctx_id_t		gssctx;		/* Authentication context @since CUPS 1.3@ */
-  gss_name_t		gssname;	/* Authentication server name @since CUPS 1.3@ */
-#  endif /* HAVE_GSSAPI */
-#  ifdef HAVE_AUTHORIZATION_H
-  AuthorizationRef	auth_ref;	/* Authorization ref */
-#  endif /* HAVE_AUTHORIZATION_H */
-};
-
-
 /*
  * Some OS's don't have hstrerror(), most notably Solaris...
  */
diff -up cups-1.3.7/cups/Makefile.headers-compat cups-1.3.7/cups/Makefile
--- cups-1.3.7/cups/Makefile.headers-compat	2008-02-20 20:18:33.000000000 +0000
+++ cups-1.3.7/cups/Makefile	2008-08-05 18:06:57.000000000 +0100
@@ -91,8 +91,10 @@ HEADERS	=	\
 		dir.h \
 		file.h \
 		http.h \
+		i18n.h \
 		ipp.h \
 		language.h \
+		md5.h \
 		ppd.h \
 		sidechannel.h \
 		transcode.h