Merge changes from CUPS 1.5svn-r9049 (private header support)

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1992 a1ca3aef-8c08-0410-bb20-df032aa958be

73 files changed, 953 insertions, 980 deletions

diff --git a/cups/Dependencies b/cups/Dependencies
index 6ccc01b66..6ddb2548b 100644
--- a/cups/Dependencies
+++ b/cups/Dependencies
@@ -1,453 +1,657 @@
 # DO NOT DELETE
 
-adminutil.o: adminutil.h cups.h ipp.h http.h versioning.h ppd.h array.h
-adminutil.o: file.h language.h globals.h string.h ../config.h http-private.h
-adminutil.o: md5.h ipp-private.h i18n.h transcode.h pwg-private.h
-adminutil.o: ../cups/cups.h debug.h
-array.o: array.h versioning.h string.h ../config.h debug.h
-attr.o: ppd-private.h cups.h ipp.h http.h versioning.h ppd.h array.h file.h
-attr.o: language.h debug.h string.h ../config.h
-auth.o: globals.h string.h ../config.h http-private.h http.h versioning.h
-auth.o: md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-auth.o: i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h
-backchannel.o: cups.h ipp.h http.h versioning.h ppd.h array.h file.h
-backchannel.o: language.h
-backend.o: backend.h versioning.h globals.h string.h ../config.h
-backend.o: http-private.h http.h md5.h ipp-private.h ipp.h cups.h ppd.h
-backend.o: array.h file.h language.h i18n.h transcode.h pwg-private.h
-backend.o: ../cups/cups.h
-conflicts.o: ppd-private.h cups.h ipp.h http.h versioning.h ppd.h array.h
-conflicts.o: file.h language.h string.h ../config.h debug.h
-custom.o: globals.h string.h ../config.h http-private.h http.h versioning.h
-custom.o: md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-custom.o: i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h
-debug.o: globals.h string.h ../config.h http-private.h http.h versioning.h
-debug.o: md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-debug.o: i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h
-dest.o: debug.h globals.h string.h ../config.h http-private.h http.h
-dest.o: versioning.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h
-dest.o: language.h i18n.h transcode.h pwg-private.h ../cups/cups.h
-dir.o: dir.h versioning.h string.h ../config.h debug.h
-emit.o: ppd.h array.h versioning.h file.h string.h ../config.h debug.h
-encode.o: cups.h ipp.h http.h versioning.h ppd.h array.h file.h language.h
-encode.o: ipp-private.h string.h ../config.h debug.h
-file.o: file-private.h http-private.h ../config.h http.h versioning.h md5.h
-file.o: ipp-private.h ipp.h globals.h string.h cups.h ppd.h array.h file.h
-file.o: language.h i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h
-getdevices.o: globals.h string.h ../config.h http-private.h http.h
-getdevices.o: versioning.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h
-getdevices.o: file.h language.h i18n.h transcode.h pwg-private.h
-getdevices.o: ../cups/cups.h debug.h
-getifaddrs.o: http-private.h ../config.h http.h versioning.h md5.h
-getifaddrs.o: ipp-private.h ipp.h
-getputfile.o: globals.h string.h ../config.h http-private.h http.h
-getputfile.o: versioning.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h
-getputfile.o: file.h language.h i18n.h transcode.h pwg-private.h
-getputfile.o: ../cups/cups.h debug.h
-globals.o: http-private.h ../config.h http.h versioning.h md5.h ipp-private.h
-globals.o: ipp.h globals.h string.h cups.h ppd.h array.h file.h language.h
-globals.o: i18n.h transcode.h pwg-private.h ../cups/cups.h
-http.o: http-private.h ../config.h http.h versioning.h md5.h ipp-private.h
-http.o: ipp.h globals.h string.h cups.h ppd.h array.h file.h language.h
-http.o: i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h
-http-addr.o: http-private.h ../config.h http.h versioning.h md5.h
-http-addr.o: ipp-private.h ipp.h globals.h string.h cups.h ppd.h array.h
-http-addr.o: file.h language.h i18n.h transcode.h pwg-private.h
-http-addr.o: ../cups/cups.h debug.h
-http-addrlist.o: http-private.h ../config.h http.h versioning.h md5.h
-http-addrlist.o: ipp-private.h ipp.h globals.h string.h cups.h ppd.h array.h
-http-addrlist.o: file.h language.h i18n.h transcode.h pwg-private.h
-http-addrlist.o: ../cups/cups.h debug.h
-http-support.o: debug.h globals.h string.h ../config.h http-private.h http.h
-http-support.o: versioning.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h
-http-support.o: file.h language.h i18n.h transcode.h pwg-private.h
-http-support.o: ../cups/cups.h
-ipp.o: http-private.h ../config.h http.h versioning.h md5.h ipp-private.h
-ipp.o: ipp.h globals.h string.h cups.h ppd.h array.h file.h language.h i18n.h
-ipp.o: transcode.h pwg-private.h ../cups/cups.h debug.h
-ipp-support.o: globals.h string.h ../config.h http-private.h http.h
-ipp-support.o: versioning.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h
-ipp-support.o: file.h language.h i18n.h transcode.h pwg-private.h
-ipp-support.o: ../cups/cups.h debug.h
-langprintf.o: globals.h string.h ../config.h http-private.h http.h
-langprintf.o: versioning.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h
-langprintf.o: file.h language.h i18n.h transcode.h pwg-private.h
-langprintf.o: ../cups/cups.h
-language.o: globals.h string.h ../config.h http-private.h http.h versioning.h
-language.o: md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-language.o: i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h
-localize.o: globals.h string.h ../config.h http-private.h http.h versioning.h
-localize.o: md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-localize.o: i18n.h transcode.h pwg-private.h ../cups/cups.h ppd-private.h
-localize.o: debug.h
-mark.o: cups.h ipp.h http.h versioning.h ppd.h array.h file.h language.h
-mark.o: string.h ../config.h debug.h pwg-private.h ../cups/cups.h
-md5.o: md5.h string.h ../config.h
-md5passwd.o: http-private.h ../config.h http.h versioning.h md5.h
-md5passwd.o: ipp-private.h ipp.h string.h
-notify.o: globals.h string.h ../config.h http-private.h http.h versioning.h
-notify.o: md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-notify.o: i18n.h transcode.h pwg-private.h ../cups/cups.h
-options.o: cups.h ipp.h http.h versioning.h ppd.h array.h file.h language.h
-options.o: string.h ../config.h debug.h
-page.o: ppd.h array.h versioning.h file.h string.h ../config.h debug.h
-ppd.o: ppd-private.h cups.h ipp.h http.h versioning.h ppd.h array.h file.h
-ppd.o: language.h pwg-private.h ../cups/cups.h globals.h string.h ../config.h
-ppd.o: http-private.h md5.h ipp-private.h i18n.h transcode.h debug.h
-pwg-file.o: pwg-private.h ../cups/cups.h globals.h string.h ../config.h
-pwg-file.o: http-private.h http.h versioning.h md5.h ipp-private.h ipp.h
-pwg-file.o: cups.h ppd.h array.h file.h language.h i18n.h transcode.h debug.h
-pwg-media.o: pwg-private.h ../cups/cups.h globals.h string.h ../config.h
-pwg-media.o: http-private.h http.h versioning.h md5.h ipp-private.h ipp.h
-pwg-media.o: cups.h ppd.h array.h file.h language.h i18n.h transcode.h
-pwg-media.o: debug.h
-pwg-ppd.o: pwg-private.h ../cups/cups.h globals.h string.h ../config.h
-pwg-ppd.o: http-private.h http.h versioning.h md5.h ipp-private.h ipp.h
-pwg-ppd.o: cups.h ppd.h array.h file.h language.h i18n.h transcode.h debug.h
-request.o: globals.h string.h ../config.h http-private.h http.h versioning.h
-request.o: md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-request.o: i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h
-sidechannel.o: sidechannel.h versioning.h string.h ../config.h debug.h
-snmp.o: globals.h string.h ../config.h http-private.h http.h versioning.h
-snmp.o: md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-snmp.o: i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h
+adminutil.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+adminutil.o: array.h file.h language.h string-private.h ../config.h
+adminutil.o: debug-private.h http-private.h ../cups/http.h md5-private.h
+adminutil.o: ipp-private.h ../cups/ipp.h language-private.h
+adminutil.o: ../cups/transcode.h pwg-private.h adminutil.h cups.h
+array.o: string-private.h ../config.h debug-private.h array.h versioning.h
+attr.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h
+attr.o: file.h language.h string-private.h ../config.h debug-private.h
+attr.o: http-private.h ../cups/http.h md5-private.h ipp-private.h
+attr.o: ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h
+attr.o: ppd-private.h
+auth.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h
+auth.o: file.h language.h string-private.h ../config.h debug-private.h
+auth.o: http-private.h ../cups/http.h md5-private.h ipp-private.h
+auth.o: ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h
+backchannel.o: cups.h
+backend.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+backend.o: array.h file.h language.h string-private.h ../config.h
+backend.o: debug-private.h http-private.h ../cups/http.h md5-private.h
+backend.o: ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h
+backend.o: pwg-private.h backend.h
+conflicts.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+conflicts.o: array.h file.h language.h string-private.h ../config.h
+conflicts.o: debug-private.h http-private.h ../cups/http.h md5-private.h
+conflicts.o: ipp-private.h ../cups/ipp.h language-private.h
+conflicts.o: ../cups/transcode.h pwg-private.h ppd-private.h
+custom.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+custom.o: array.h file.h language.h string-private.h ../config.h
+custom.o: debug-private.h http-private.h ../cups/http.h md5-private.h
+custom.o: ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h
+custom.o: pwg-private.h
+debug.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+debug.o: array.h file.h language.h string-private.h ../config.h
+debug.o: debug-private.h http-private.h ../cups/http.h md5-private.h
+debug.o: ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h
+debug.o: pwg-private.h
+dest.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h
+dest.o: file.h language.h string-private.h ../config.h debug-private.h
+dest.o: http-private.h ../cups/http.h md5-private.h ipp-private.h
+dest.o: ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h
+dir.o: string-private.h ../config.h debug-private.h dir.h versioning.h
+emit.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h
+emit.o: file.h language.h string-private.h ../config.h debug-private.h
+emit.o: http-private.h ../cups/http.h md5-private.h ipp-private.h
+emit.o: ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h
+encode.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+encode.o: array.h file.h language.h string-private.h ../config.h
+encode.o: debug-private.h http-private.h ../cups/http.h md5-private.h
+encode.o: ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h
+encode.o: pwg-private.h
+file.o: file-private.h cups-private.h ../cups/cups.h ipp.h http.h
+file.o: versioning.h ppd.h array.h file.h language.h string-private.h
+file.o: ../config.h debug-private.h http-private.h ../cups/http.h
+file.o: md5-private.h ipp-private.h ../cups/ipp.h language-private.h
+file.o: ../cups/transcode.h pwg-private.h
+getdevices.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+getdevices.o: array.h file.h language.h string-private.h ../config.h
+getdevices.o: debug-private.h http-private.h ../cups/http.h md5-private.h
+getdevices.o: ipp-private.h ../cups/ipp.h language-private.h
+getdevices.o: ../cups/transcode.h pwg-private.h
+getifaddrs.o: http-private.h ../config.h ../cups/http.h md5-private.h
+getifaddrs.o: ipp-private.h ../cups/ipp.h
+getputfile.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+getputfile.o: array.h file.h language.h string-private.h ../config.h
+getputfile.o: debug-private.h http-private.h ../cups/http.h md5-private.h
+getputfile.o: ipp-private.h ../cups/ipp.h language-private.h
+getputfile.o: ../cups/transcode.h pwg-private.h
+globals.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+globals.o: array.h file.h language.h string-private.h ../config.h
+globals.o: debug-private.h http-private.h ../cups/http.h md5-private.h
+globals.o: ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h
+globals.o: pwg-private.h
+http.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h
+http.o: file.h language.h string-private.h ../config.h debug-private.h
+http.o: http-private.h ../cups/http.h md5-private.h ipp-private.h
+http.o: ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h
+http-addr.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+http-addr.o: array.h file.h language.h string-private.h ../config.h
+http-addr.o: debug-private.h http-private.h ../cups/http.h md5-private.h
+http-addr.o: ipp-private.h ../cups/ipp.h language-private.h
+http-addr.o: ../cups/transcode.h pwg-private.h
+http-addrlist.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h
+http-addrlist.o: ppd.h array.h file.h language.h string-private.h ../config.h
+http-addrlist.o: debug-private.h http-private.h ../cups/http.h md5-private.h
+http-addrlist.o: ipp-private.h ../cups/ipp.h language-private.h
+http-addrlist.o: ../cups/transcode.h pwg-private.h
+http-support.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+http-support.o: array.h file.h language.h string-private.h ../config.h
+http-support.o: debug-private.h http-private.h ../cups/http.h md5-private.h
+http-support.o: ipp-private.h ../cups/ipp.h language-private.h
+http-support.o: ../cups/transcode.h pwg-private.h
+ipp.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h
+ipp.o: file.h language.h string-private.h ../config.h debug-private.h
+ipp.o: http-private.h ../cups/http.h md5-private.h ipp-private.h
+ipp.o: ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h
+ipp-support.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+ipp-support.o: array.h file.h language.h string-private.h ../config.h
+ipp-support.o: debug-private.h http-private.h ../cups/http.h md5-private.h
+ipp-support.o: ipp-private.h ../cups/ipp.h language-private.h
+ipp-support.o: ../cups/transcode.h pwg-private.h
+langprintf.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+langprintf.o: array.h file.h language.h string-private.h ../config.h
+langprintf.o: debug-private.h http-private.h ../cups/http.h md5-private.h
+langprintf.o: ipp-private.h ../cups/ipp.h language-private.h
+langprintf.o: ../cups/transcode.h pwg-private.h
+language.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+language.o: array.h file.h language.h string-private.h ../config.h
+language.o: debug-private.h http-private.h ../cups/http.h md5-private.h
+language.o: ipp-private.h ../cups/ipp.h language-private.h
+language.o: ../cups/transcode.h pwg-private.h
+localize.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+localize.o: array.h file.h language.h string-private.h ../config.h
+localize.o: debug-private.h http-private.h ../cups/http.h md5-private.h
+localize.o: ipp-private.h ../cups/ipp.h language-private.h
+localize.o: ../cups/transcode.h pwg-private.h ppd-private.h
+mark.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h
+mark.o: file.h language.h string-private.h ../config.h debug-private.h
+mark.o: http-private.h ../cups/http.h md5-private.h ipp-private.h
+mark.o: ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h
+md5.o: md5-private.h string-private.h ../config.h
+md5passwd.o: http-private.h ../config.h ../cups/http.h md5-private.h
+md5passwd.o: ipp-private.h ../cups/ipp.h string-private.h
+notify.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+notify.o: array.h file.h language.h string-private.h ../config.h
+notify.o: debug-private.h http-private.h ../cups/http.h md5-private.h
+notify.o: ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h
+notify.o: pwg-private.h
+options.o: cups.h string-private.h ../config.h debug-private.h
+page.o: string-private.h ../config.h debug-private.h ppd.h array.h
+page.o: versioning.h file.h
+ppd.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h
+ppd.o: file.h language.h string-private.h ../config.h debug-private.h
+ppd.o: http-private.h ../cups/http.h md5-private.h ipp-private.h
+ppd.o: ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h
+ppd.o: ppd-private.h
+pwg-file.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+pwg-file.o: array.h file.h language.h string-private.h ../config.h
+pwg-file.o: debug-private.h http-private.h ../cups/http.h md5-private.h
+pwg-file.o: ipp-private.h ../cups/ipp.h language-private.h
+pwg-file.o: ../cups/transcode.h pwg-private.h
+pwg-media.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+pwg-media.o: array.h file.h language.h string-private.h ../config.h
+pwg-media.o: debug-private.h http-private.h ../cups/http.h md5-private.h
+pwg-media.o: ipp-private.h ../cups/ipp.h language-private.h
+pwg-media.o: ../cups/transcode.h pwg-private.h
+pwg-ppd.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+pwg-ppd.o: array.h file.h language.h string-private.h ../config.h
+pwg-ppd.o: debug-private.h http-private.h ../cups/http.h md5-private.h
+pwg-ppd.o: ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h
+pwg-ppd.o: pwg-private.h
+request.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+request.o: array.h file.h language.h string-private.h ../config.h
+request.o: debug-private.h http-private.h ../cups/http.h md5-private.h
+request.o: ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h
+request.o: pwg-private.h
+sidechannel.o: sidechannel.h versioning.h string-private.h ../config.h
+sidechannel.o: debug-private.h
+snmp.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h
+snmp.o: file.h language.h string-private.h ../config.h debug-private.h
+snmp.o: http-private.h ../cups/http.h md5-private.h ipp-private.h
+snmp.o: ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h
 snmp.o: snmp-private.h
-snprintf.o: string.h ../config.h
-string.o: array.h versioning.h debug.h string.h ../config.h
-tempfile.o: globals.h string.h ../config.h http-private.h http.h versioning.h
-tempfile.o: md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-tempfile.o: i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h
-transcode.o: globals.h string.h ../config.h http-private.h http.h
-transcode.o: versioning.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h
-transcode.o: file.h language.h i18n.h transcode.h pwg-private.h
-transcode.o: ../cups/cups.h debug.h
-usersys.o: http-private.h ../config.h http.h versioning.h md5.h ipp-private.h
-usersys.o: ipp.h globals.h string.h cups.h ppd.h array.h file.h language.h
-usersys.o: i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h
-util.o: globals.h string.h ../config.h http-private.h http.h versioning.h
-util.o: md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-util.o: i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h
-testadmin.o: adminutil.h cups.h ipp.h http.h versioning.h ppd.h array.h
-testadmin.o: file.h language.h string.h ../config.h
-testarray.o: ../cups/string.h ../config.h string.h array.h versioning.h dir.h
-testarray.o: debug.h
-testconflicts.o: cups.h ipp.h http.h versioning.h ppd.h array.h file.h
-testconflicts.o: language.h string.h ../config.h
-testcups.o: cups.h ipp.h http.h versioning.h ppd.h array.h file.h language.h
-testcups.o: string.h ../config.h
-testfile.o: string.h ../config.h file.h versioning.h debug.h
-testhttp.o: http-private.h ../config.h http.h versioning.h md5.h
-testhttp.o: ipp-private.h ipp.h string.h
-testi18n.o: i18n.h transcode.h language.h array.h versioning.h string.h
-testi18n.o: ../config.h
-testipp.o: ../cups/string.h ../config.h string.h ipp-private.h ipp.h http.h
-testipp.o: versioning.h
-testoptions.o: string.h ../config.h cups.h ipp.h http.h versioning.h ppd.h
-testoptions.o: array.h file.h language.h
-testlang.o: i18n.h transcode.h language.h array.h versioning.h string.h
-testlang.o: ../config.h
-testppd.o: ../cups/cups.h ../cups/string.h ../config.h string.h
-testpwg.o: pwg-private.h ../cups/cups.h
-testsnmp.o: string.h ../config.h snmp-private.h http.h versioning.h
+snprintf.o: string-private.h ../config.h
+string.o: string-private.h ../config.h debug-private.h array.h versioning.h
+tempfile.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+tempfile.o: array.h file.h language.h string-private.h ../config.h
+tempfile.o: debug-private.h http-private.h ../cups/http.h md5-private.h
+tempfile.o: ipp-private.h ../cups/ipp.h language-private.h
+tempfile.o: ../cups/transcode.h pwg-private.h
+transcode.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+transcode.o: array.h file.h language.h string-private.h ../config.h
+transcode.o: debug-private.h http-private.h ../cups/http.h md5-private.h
+transcode.o: ipp-private.h ../cups/ipp.h language-private.h
+transcode.o: ../cups/transcode.h pwg-private.h
+usersys.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+usersys.o: array.h file.h language.h string-private.h ../config.h
+usersys.o: debug-private.h http-private.h ../cups/http.h md5-private.h
+usersys.o: ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h
+usersys.o: pwg-private.h
+util.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h
+util.o: file.h language.h string-private.h ../config.h debug-private.h
+util.o: http-private.h ../cups/http.h md5-private.h ipp-private.h
+util.o: ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h
+testadmin.o: adminutil.h cups.h string-private.h ../config.h
+testarray.o: string-private.h ../config.h debug-private.h array.h
+testarray.o: versioning.h dir.h
+testconflicts.o: cups.h string-private.h ../config.h
+testcups.o: string-private.h ../config.h cups.h
+testfile.o: string-private.h ../config.h debug-private.h file.h versioning.h
+testhttp.o: string-private.h ../config.h http-private.h ../cups/http.h
+testhttp.o: md5-private.h ipp-private.h ../cups/ipp.h
+testi18n.o: string-private.h ../config.h language-private.h
+testi18n.o: ../cups/transcode.h language.h array.h versioning.h
+testipp.o: ../cups/file.h versioning.h string-private.h ../config.h
+testipp.o: ipp-private.h ../cups/ipp.h
+testoptions.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+testoptions.o: array.h file.h language.h string-private.h ../config.h
+testoptions.o: debug-private.h http-private.h ../cups/http.h md5-private.h
+testoptions.o: ipp-private.h ../cups/ipp.h language-private.h
+testoptions.o: ../cups/transcode.h pwg-private.h
+testlang.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+testlang.o: array.h file.h language.h string-private.h ../config.h
+testlang.o: debug-private.h http-private.h ../cups/http.h md5-private.h
+testlang.o: ipp-private.h ../cups/ipp.h language-private.h
+testlang.o: ../cups/transcode.h pwg-private.h
+testppd.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+testppd.o: array.h file.h language.h string-private.h ../config.h
+testppd.o: debug-private.h http-private.h ../cups/http.h md5-private.h
+testppd.o: ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h
+testppd.o: pwg-private.h
+testpwg.o: pwg-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+testpwg.o: array.h file.h language.h
+testsnmp.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+testsnmp.o: array.h file.h language.h string-private.h ../config.h
+testsnmp.o: debug-private.h http-private.h ../cups/http.h md5-private.h
+testsnmp.o: ipp-private.h ../cups/ipp.h language-private.h
+testsnmp.o: ../cups/transcode.h pwg-private.h snmp-private.h
 # DO NOT DELETE
 
-adminutil.32.o: adminutil.c  adminutil.h cups.h ipp.h http.h versioning.h ppd.h array.h
-adminutil.32.o: adminutil.c  file.h language.h globals.h string.h ../config.h http-private.h
-adminutil.32.o: adminutil.c  md5.h ipp-private.h i18n.h transcode.h pwg-private.h
-adminutil.32.o: adminutil.c  ../cups/cups.h debug.h
-array.32.o: array.c  array.h versioning.h string.h ../config.h debug.h
-attr.32.o: attr.c  ppd-private.h cups.h ipp.h http.h versioning.h ppd.h array.h file.h
-attr.32.o: attr.c  language.h debug.h string.h ../config.h
-auth.32.o: auth.c  globals.h string.h ../config.h http-private.h http.h versioning.h
-auth.32.o: auth.c  md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-auth.32.o: auth.c  i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h
-backchannel.32.o: backchannel.c  cups.h ipp.h http.h versioning.h ppd.h array.h file.h
-backchannel.32.o: backchannel.c  language.h
-backend.32.o: backend.c  backend.h versioning.h globals.h string.h ../config.h
-backend.32.o: backend.c  http-private.h http.h md5.h ipp-private.h ipp.h cups.h ppd.h
-backend.32.o: backend.c  array.h file.h language.h i18n.h transcode.h pwg-private.h
-backend.32.o: backend.c  ../cups/cups.h
-conflicts.32.o: conflicts.c  ppd-private.h cups.h ipp.h http.h versioning.h ppd.h array.h
-conflicts.32.o: conflicts.c  file.h language.h string.h ../config.h debug.h
-custom.32.o: custom.c  globals.h string.h ../config.h http-private.h http.h versioning.h
-custom.32.o: custom.c  md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-custom.32.o: custom.c  i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h
-debug.32.o: debug.c  globals.h string.h ../config.h http-private.h http.h versioning.h
-debug.32.o: debug.c  md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-debug.32.o: debug.c  i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h
-dest.32.o: dest.c  debug.h globals.h string.h ../config.h http-private.h http.h
-dest.32.o: dest.c  versioning.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h
-dest.32.o: dest.c  language.h i18n.h transcode.h pwg-private.h ../cups/cups.h
-dir.32.o: dir.c  dir.h versioning.h string.h ../config.h debug.h
-emit.32.o: emit.c  ppd.h array.h versioning.h file.h string.h ../config.h debug.h
-encode.32.o: encode.c  cups.h ipp.h http.h versioning.h ppd.h array.h file.h language.h
-encode.32.o: encode.c  ipp-private.h string.h ../config.h debug.h
-file.32.o: file.c  file-private.h http-private.h ../config.h http.h versioning.h md5.h
-file.32.o: file.c  ipp-private.h ipp.h globals.h string.h cups.h ppd.h array.h file.h
-file.32.o: file.c  language.h i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h
-getdevices.32.o: getdevices.c  globals.h string.h ../config.h http-private.h http.h
-getdevices.32.o: getdevices.c  versioning.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h
-getdevices.32.o: getdevices.c  file.h language.h i18n.h transcode.h pwg-private.h
-getdevices.32.o: getdevices.c  ../cups/cups.h debug.h
-getifaddrs.32.o: getifaddrs.c  http-private.h ../config.h http.h versioning.h md5.h
-getifaddrs.32.o: getifaddrs.c  ipp-private.h ipp.h
-getputfile.32.o: getputfile.c  globals.h string.h ../config.h http-private.h http.h
-getputfile.32.o: getputfile.c  versioning.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h
-getputfile.32.o: getputfile.c  file.h language.h i18n.h transcode.h pwg-private.h
-getputfile.32.o: getputfile.c  ../cups/cups.h debug.h
-globals.32.o: globals.c  http-private.h ../config.h http.h versioning.h md5.h ipp-private.h
-globals.32.o: globals.c  ipp.h globals.h string.h cups.h ppd.h array.h file.h language.h
-globals.32.o: globals.c  i18n.h transcode.h pwg-private.h ../cups/cups.h
-http.32.o: http.c  http-private.h ../config.h http.h versioning.h md5.h ipp-private.h
-http.32.o: http.c  ipp.h globals.h string.h cups.h ppd.h array.h file.h language.h
-http.32.o: http.c  i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h
-http-addr.32.o: http-addr.c  http-private.h ../config.h http.h versioning.h md5.h
-http-addr.32.o: http-addr.c  ipp-private.h ipp.h globals.h string.h cups.h ppd.h array.h
-http-addr.32.o: http-addr.c  file.h language.h i18n.h transcode.h pwg-private.h
-http-addr.32.o: http-addr.c  ../cups/cups.h debug.h
-http-addrlist.32.o: http-addrlist.c  http-private.h ../config.h http.h versioning.h md5.h
-http-addrlist.32.o: http-addrlist.c  ipp-private.h ipp.h globals.h string.h cups.h ppd.h array.h
-http-addrlist.32.o: http-addrlist.c  file.h language.h i18n.h transcode.h pwg-private.h
-http-addrlist.32.o: http-addrlist.c  ../cups/cups.h debug.h
-http-support.32.o: http-support.c  debug.h globals.h string.h ../config.h http-private.h http.h
-http-support.32.o: http-support.c  versioning.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h
-http-support.32.o: http-support.c  file.h language.h i18n.h transcode.h pwg-private.h
-http-support.32.o: http-support.c  ../cups/cups.h
-ipp.32.o: ipp.c  http-private.h ../config.h http.h versioning.h md5.h ipp-private.h
-ipp.32.o: ipp.c  ipp.h globals.h string.h cups.h ppd.h array.h file.h language.h i18n.h
-ipp.32.o: ipp.c  transcode.h pwg-private.h ../cups/cups.h debug.h
-ipp-support.32.o: ipp-support.c  globals.h string.h ../config.h http-private.h http.h
-ipp-support.32.o: ipp-support.c  versioning.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h
-ipp-support.32.o: ipp-support.c  file.h language.h i18n.h transcode.h pwg-private.h
-ipp-support.32.o: ipp-support.c  ../cups/cups.h debug.h
-langprintf.32.o: langprintf.c  globals.h string.h ../config.h http-private.h http.h
-langprintf.32.o: langprintf.c  versioning.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h
-langprintf.32.o: langprintf.c  file.h language.h i18n.h transcode.h pwg-private.h
-langprintf.32.o: langprintf.c  ../cups/cups.h
-language.32.o: language.c  globals.h string.h ../config.h http-private.h http.h versioning.h
-language.32.o: language.c  md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-language.32.o: language.c  i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h
-localize.32.o: localize.c  globals.h string.h ../config.h http-private.h http.h versioning.h
-localize.32.o: localize.c  md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-localize.32.o: localize.c  i18n.h transcode.h pwg-private.h ../cups/cups.h ppd-private.h
-localize.32.o: localize.c  debug.h
-mark.32.o: mark.c  cups.h ipp.h http.h versioning.h ppd.h array.h file.h language.h
-mark.32.o: mark.c  string.h ../config.h debug.h pwg-private.h ../cups/cups.h
-md5.32.o: md5.c  md5.h string.h ../config.h
-md5passwd.32.o: md5passwd.c  http-private.h ../config.h http.h versioning.h md5.h
-md5passwd.32.o: md5passwd.c  ipp-private.h ipp.h string.h
-notify.32.o: notify.c  globals.h string.h ../config.h http-private.h http.h versioning.h
-notify.32.o: notify.c  md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-notify.32.o: notify.c  i18n.h transcode.h pwg-private.h ../cups/cups.h
-options.32.o: options.c  cups.h ipp.h http.h versioning.h ppd.h array.h file.h language.h
-options.32.o: options.c  string.h ../config.h debug.h
-page.32.o: page.c  ppd.h array.h versioning.h file.h string.h ../config.h debug.h
-ppd.32.o: ppd.c  ppd-private.h cups.h ipp.h http.h versioning.h ppd.h array.h file.h
-ppd.32.o: ppd.c  language.h pwg-private.h ../cups/cups.h globals.h string.h ../config.h
-ppd.32.o: ppd.c  http-private.h md5.h ipp-private.h i18n.h transcode.h debug.h
-pwg-file.32.o: pwg-file.c  pwg-private.h ../cups/cups.h globals.h string.h ../config.h
-pwg-file.32.o: pwg-file.c  http-private.h http.h versioning.h md5.h ipp-private.h ipp.h
-pwg-file.32.o: pwg-file.c  cups.h ppd.h array.h file.h language.h i18n.h transcode.h debug.h
-pwg-media.32.o: pwg-media.c  pwg-private.h ../cups/cups.h globals.h string.h ../config.h
-pwg-media.32.o: pwg-media.c  http-private.h http.h versioning.h md5.h ipp-private.h ipp.h
-pwg-media.32.o: pwg-media.c  cups.h ppd.h array.h file.h language.h i18n.h transcode.h
-pwg-media.32.o: pwg-media.c  debug.h
-pwg-ppd.32.o: pwg-ppd.c  pwg-private.h ../cups/cups.h globals.h string.h ../config.h
-pwg-ppd.32.o: pwg-ppd.c  http-private.h http.h versioning.h md5.h ipp-private.h ipp.h
-pwg-ppd.32.o: pwg-ppd.c  cups.h ppd.h array.h file.h language.h i18n.h transcode.h debug.h
-request.32.o: request.c  globals.h string.h ../config.h http-private.h http.h versioning.h
-request.32.o: request.c  md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-request.32.o: request.c  i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h
-sidechannel.32.o: sidechannel.c  sidechannel.h versioning.h string.h ../config.h debug.h
-snmp.32.o: snmp.c  globals.h string.h ../config.h http-private.h http.h versioning.h
-snmp.32.o: snmp.c  md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-snmp.32.o: snmp.c  i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h
+adminutil.32.o: adminutil.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+adminutil.32.o: adminutil.c  array.h file.h language.h string-private.h ../config.h
+adminutil.32.o: adminutil.c  debug-private.h http-private.h ../cups/http.h md5-private.h
+adminutil.32.o: adminutil.c  ipp-private.h ../cups/ipp.h language-private.h
+adminutil.32.o: adminutil.c  ../cups/transcode.h pwg-private.h adminutil.h cups.h
+array.32.o: array.c  string-private.h ../config.h debug-private.h array.h versioning.h
+attr.32.o: attr.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h
+attr.32.o: attr.c  file.h language.h string-private.h ../config.h debug-private.h
+attr.32.o: attr.c  http-private.h ../cups/http.h md5-private.h ipp-private.h
+attr.32.o: attr.c  ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h
+attr.32.o: attr.c  ppd-private.h
+auth.32.o: auth.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h
+auth.32.o: auth.c  file.h language.h string-private.h ../config.h debug-private.h
+auth.32.o: auth.c  http-private.h ../cups/http.h md5-private.h ipp-private.h
+auth.32.o: auth.c  ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h
+backchannel.32.o: backchannel.c  cups.h
+backend.32.o: backend.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+backend.32.o: backend.c  array.h file.h language.h string-private.h ../config.h
+backend.32.o: backend.c  debug-private.h http-private.h ../cups/http.h md5-private.h
+backend.32.o: backend.c  ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h
+backend.32.o: backend.c  pwg-private.h backend.h
+conflicts.32.o: conflicts.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+conflicts.32.o: conflicts.c  array.h file.h language.h string-private.h ../config.h
+conflicts.32.o: conflicts.c  debug-private.h http-private.h ../cups/http.h md5-private.h
+conflicts.32.o: conflicts.c  ipp-private.h ../cups/ipp.h language-private.h
+conflicts.32.o: conflicts.c  ../cups/transcode.h pwg-private.h ppd-private.h
+custom.32.o: custom.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+custom.32.o: custom.c  array.h file.h language.h string-private.h ../config.h
+custom.32.o: custom.c  debug-private.h http-private.h ../cups/http.h md5-private.h
+custom.32.o: custom.c  ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h
+custom.32.o: custom.c  pwg-private.h
+debug.32.o: debug.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+debug.32.o: debug.c  array.h file.h language.h string-private.h ../config.h
+debug.32.o: debug.c  debug-private.h http-private.h ../cups/http.h md5-private.h
+debug.32.o: debug.c  ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h
+debug.32.o: debug.c  pwg-private.h
+dest.32.o: dest.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h
+dest.32.o: dest.c  file.h language.h string-private.h ../config.h debug-private.h
+dest.32.o: dest.c  http-private.h ../cups/http.h md5-private.h ipp-private.h
+dest.32.o: dest.c  ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h
+dir.32.o: dir.c  string-private.h ../config.h debug-private.h dir.h versioning.h
+emit.32.o: emit.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h
+emit.32.o: emit.c  file.h language.h string-private.h ../config.h debug-private.h
+emit.32.o: emit.c  http-private.h ../cups/http.h md5-private.h ipp-private.h
+emit.32.o: emit.c  ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h
+encode.32.o: encode.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+encode.32.o: encode.c  array.h file.h language.h string-private.h ../config.h
+encode.32.o: encode.c  debug-private.h http-private.h ../cups/http.h md5-private.h
+encode.32.o: encode.c  ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h
+encode.32.o: encode.c  pwg-private.h
+file.32.o: file.c  file-private.h cups-private.h ../cups/cups.h ipp.h http.h
+file.32.o: file.c  versioning.h ppd.h array.h file.h language.h string-private.h
+file.32.o: file.c  ../config.h debug-private.h http-private.h ../cups/http.h
+file.32.o: file.c  md5-private.h ipp-private.h ../cups/ipp.h language-private.h
+file.32.o: file.c  ../cups/transcode.h pwg-private.h
+getdevices.32.o: getdevices.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+getdevices.32.o: getdevices.c  array.h file.h language.h string-private.h ../config.h
+getdevices.32.o: getdevices.c  debug-private.h http-private.h ../cups/http.h md5-private.h
+getdevices.32.o: getdevices.c  ipp-private.h ../cups/ipp.h language-private.h
+getdevices.32.o: getdevices.c  ../cups/transcode.h pwg-private.h
+getifaddrs.32.o: getifaddrs.c  http-private.h ../config.h ../cups/http.h md5-private.h
+getifaddrs.32.o: getifaddrs.c  ipp-private.h ../cups/ipp.h
+getputfile.32.o: getputfile.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+getputfile.32.o: getputfile.c  array.h file.h language.h string-private.h ../config.h
+getputfile.32.o: getputfile.c  debug-private.h http-private.h ../cups/http.h md5-private.h
+getputfile.32.o: getputfile.c  ipp-private.h ../cups/ipp.h language-private.h
+getputfile.32.o: getputfile.c  ../cups/transcode.h pwg-private.h
+globals.32.o: globals.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+globals.32.o: globals.c  array.h file.h language.h string-private.h ../config.h
+globals.32.o: globals.c  debug-private.h http-private.h ../cups/http.h md5-private.h
+globals.32.o: globals.c  ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h
+globals.32.o: globals.c  pwg-private.h
+http.32.o: http.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h
+http.32.o: http.c  file.h language.h string-private.h ../config.h debug-private.h
+http.32.o: http.c  http-private.h ../cups/http.h md5-private.h ipp-private.h
+http.32.o: http.c  ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h
+http-addr.32.o: http-addr.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+http-addr.32.o: http-addr.c  array.h file.h language.h string-private.h ../config.h
+http-addr.32.o: http-addr.c  debug-private.h http-private.h ../cups/http.h md5-private.h
+http-addr.32.o: http-addr.c  ipp-private.h ../cups/ipp.h language-private.h
+http-addr.32.o: http-addr.c  ../cups/transcode.h pwg-private.h
+http-addrlist.32.o: http-addrlist.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h
+http-addrlist.32.o: http-addrlist.c  ppd.h array.h file.h language.h string-private.h ../config.h
+http-addrlist.32.o: http-addrlist.c  debug-private.h http-private.h ../cups/http.h md5-private.h
+http-addrlist.32.o: http-addrlist.c  ipp-private.h ../cups/ipp.h language-private.h
+http-addrlist.32.o: http-addrlist.c  ../cups/transcode.h pwg-private.h
+http-support.32.o: http-support.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+http-support.32.o: http-support.c  array.h file.h language.h string-private.h ../config.h
+http-support.32.o: http-support.c  debug-private.h http-private.h ../cups/http.h md5-private.h
+http-support.32.o: http-support.c  ipp-private.h ../cups/ipp.h language-private.h
+http-support.32.o: http-support.c  ../cups/transcode.h pwg-private.h
+ipp.32.o: ipp.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h
+ipp.32.o: ipp.c  file.h language.h string-private.h ../config.h debug-private.h
+ipp.32.o: ipp.c  http-private.h ../cups/http.h md5-private.h ipp-private.h
+ipp.32.o: ipp.c  ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h
+ipp-support.32.o: ipp-support.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+ipp-support.32.o: ipp-support.c  array.h file.h language.h string-private.h ../config.h
+ipp-support.32.o: ipp-support.c  debug-private.h http-private.h ../cups/http.h md5-private.h
+ipp-support.32.o: ipp-support.c  ipp-private.h ../cups/ipp.h language-private.h
+ipp-support.32.o: ipp-support.c  ../cups/transcode.h pwg-private.h
+langprintf.32.o: langprintf.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+langprintf.32.o: langprintf.c  array.h file.h language.h string-private.h ../config.h
+langprintf.32.o: langprintf.c  debug-private.h http-private.h ../cups/http.h md5-private.h
+langprintf.32.o: langprintf.c  ipp-private.h ../cups/ipp.h language-private.h
+langprintf.32.o: langprintf.c  ../cups/transcode.h pwg-private.h
+language.32.o: language.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+language.32.o: language.c  array.h file.h language.h string-private.h ../config.h
+language.32.o: language.c  debug-private.h http-private.h ../cups/http.h md5-private.h
+language.32.o: language.c  ipp-private.h ../cups/ipp.h language-private.h
+language.32.o: language.c  ../cups/transcode.h pwg-private.h
+localize.32.o: localize.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+localize.32.o: localize.c  array.h file.h language.h string-private.h ../config.h
+localize.32.o: localize.c  debug-private.h http-private.h ../cups/http.h md5-private.h
+localize.32.o: localize.c  ipp-private.h ../cups/ipp.h language-private.h
+localize.32.o: localize.c  ../cups/transcode.h pwg-private.h ppd-private.h
+mark.32.o: mark.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h
+mark.32.o: mark.c  file.h language.h string-private.h ../config.h debug-private.h
+mark.32.o: mark.c  http-private.h ../cups/http.h md5-private.h ipp-private.h
+mark.32.o: mark.c  ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h
+md5.32.o: md5.c  md5-private.h string-private.h ../config.h
+md5passwd.32.o: md5passwd.c  http-private.h ../config.h ../cups/http.h md5-private.h
+md5passwd.32.o: md5passwd.c  ipp-private.h ../cups/ipp.h string-private.h
+notify.32.o: notify.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+notify.32.o: notify.c  array.h file.h language.h string-private.h ../config.h
+notify.32.o: notify.c  debug-private.h http-private.h ../cups/http.h md5-private.h
+notify.32.o: notify.c  ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h
+notify.32.o: notify.c  pwg-private.h
+options.32.o: options.c  cups.h string-private.h ../config.h debug-private.h
+page.32.o: page.c  string-private.h ../config.h debug-private.h ppd.h array.h
+page.32.o: page.c  versioning.h file.h
+ppd.32.o: ppd.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h
+ppd.32.o: ppd.c  file.h language.h string-private.h ../config.h debug-private.h
+ppd.32.o: ppd.c  http-private.h ../cups/http.h md5-private.h ipp-private.h
+ppd.32.o: ppd.c  ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h
+ppd.32.o: ppd.c  ppd-private.h
+pwg-file.32.o: pwg-file.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+pwg-file.32.o: pwg-file.c  array.h file.h language.h string-private.h ../config.h
+pwg-file.32.o: pwg-file.c  debug-private.h http-private.h ../cups/http.h md5-private.h
+pwg-file.32.o: pwg-file.c  ipp-private.h ../cups/ipp.h language-private.h
+pwg-file.32.o: pwg-file.c  ../cups/transcode.h pwg-private.h
+pwg-media.32.o: pwg-media.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+pwg-media.32.o: pwg-media.c  array.h file.h language.h string-private.h ../config.h
+pwg-media.32.o: pwg-media.c  debug-private.h http-private.h ../cups/http.h md5-private.h
+pwg-media.32.o: pwg-media.c  ipp-private.h ../cups/ipp.h language-private.h
+pwg-media.32.o: pwg-media.c  ../cups/transcode.h pwg-private.h
+pwg-ppd.32.o: pwg-ppd.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+pwg-ppd.32.o: pwg-ppd.c  array.h file.h language.h string-private.h ../config.h
+pwg-ppd.32.o: pwg-ppd.c  debug-private.h http-private.h ../cups/http.h md5-private.h
+pwg-ppd.32.o: pwg-ppd.c  ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h
+pwg-ppd.32.o: pwg-ppd.c  pwg-private.h
+request.32.o: request.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+request.32.o: request.c  array.h file.h language.h string-private.h ../config.h
+request.32.o: request.c  debug-private.h http-private.h ../cups/http.h md5-private.h
+request.32.o: request.c  ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h
+request.32.o: request.c  pwg-private.h
+sidechannel.32.o: sidechannel.c  sidechannel.h versioning.h string-private.h ../config.h
+sidechannel.32.o: sidechannel.c  debug-private.h
+snmp.32.o: snmp.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h
+snmp.32.o: snmp.c  file.h language.h string-private.h ../config.h debug-private.h
+snmp.32.o: snmp.c  http-private.h ../cups/http.h md5-private.h ipp-private.h
+snmp.32.o: snmp.c  ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h
 snmp.32.o: snmp.c  snmp-private.h
-snprintf.32.o: snprintf.c  string.h ../config.h
-string.32.o: string.c  array.h versioning.h debug.h string.h ../config.h
-tempfile.32.o: tempfile.c  globals.h string.h ../config.h http-private.h http.h versioning.h
-tempfile.32.o: tempfile.c  md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-tempfile.32.o: tempfile.c  i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h
-transcode.32.o: transcode.c  globals.h string.h ../config.h http-private.h http.h
-transcode.32.o: transcode.c  versioning.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h
-transcode.32.o: transcode.c  file.h language.h i18n.h transcode.h pwg-private.h
-transcode.32.o: transcode.c  ../cups/cups.h debug.h
-usersys.32.o: usersys.c  http-private.h ../config.h http.h versioning.h md5.h ipp-private.h
-usersys.32.o: usersys.c  ipp.h globals.h string.h cups.h ppd.h array.h file.h language.h
-usersys.32.o: usersys.c  i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h
-util.32.o: util.c  globals.h string.h ../config.h http-private.h http.h versioning.h
-util.32.o: util.c  md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-util.32.o: util.c  i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h
-testadmin.32.o: testadmin.c  adminutil.h cups.h ipp.h http.h versioning.h ppd.h array.h
-testadmin.32.o: testadmin.c  file.h language.h string.h ../config.h
-testarray.32.o: testarray.c  ../cups/string.h ../config.h string.h array.h versioning.h dir.h
-testarray.32.o: testarray.c  debug.h
-testconflicts.32.o: testconflicts.c  cups.h ipp.h http.h versioning.h ppd.h array.h file.h
-testconflicts.32.o: testconflicts.c  language.h string.h ../config.h
-testcups.32.o: testcups.c  cups.h ipp.h http.h versioning.h ppd.h array.h file.h language.h
-testcups.32.o: testcups.c  string.h ../config.h
-testfile.32.o: testfile.c  string.h ../config.h file.h versioning.h debug.h
-testhttp.32.o: testhttp.c  http-private.h ../config.h http.h versioning.h md5.h
-testhttp.32.o: testhttp.c  ipp-private.h ipp.h string.h
-testi18n.32.o: testi18n.c  i18n.h transcode.h language.h array.h versioning.h string.h
-testi18n.32.o: testi18n.c  ../config.h
-testipp.32.o: testipp.c  ../cups/string.h ../config.h string.h ipp-private.h ipp.h http.h
-testipp.32.o: testipp.c  versioning.h
-testoptions.32.o: testoptions.c  string.h ../config.h cups.h ipp.h http.h versioning.h ppd.h
-testoptions.32.o: testoptions.c  array.h file.h language.h
-testlang.32.o: testlang.c  i18n.h transcode.h language.h array.h versioning.h string.h
-testlang.32.o: testlang.c  ../config.h
-testppd.32.o: testppd.c  ../cups/cups.h ../cups/string.h ../config.h string.h
-testpwg.32.o: testpwg.c  pwg-private.h ../cups/cups.h
-testsnmp.32.o: testsnmp.c  string.h ../config.h snmp-private.h http.h versioning.h
+snprintf.32.o: snprintf.c  string-private.h ../config.h
+string.32.o: string.c  string-private.h ../config.h debug-private.h array.h versioning.h
+tempfile.32.o: tempfile.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+tempfile.32.o: tempfile.c  array.h file.h language.h string-private.h ../config.h
+tempfile.32.o: tempfile.c  debug-private.h http-private.h ../cups/http.h md5-private.h
+tempfile.32.o: tempfile.c  ipp-private.h ../cups/ipp.h language-private.h
+tempfile.32.o: tempfile.c  ../cups/transcode.h pwg-private.h
+transcode.32.o: transcode.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+transcode.32.o: transcode.c  array.h file.h language.h string-private.h ../config.h
+transcode.32.o: transcode.c  debug-private.h http-private.h ../cups/http.h md5-private.h
+transcode.32.o: transcode.c  ipp-private.h ../cups/ipp.h language-private.h
+transcode.32.o: transcode.c  ../cups/transcode.h pwg-private.h
+usersys.32.o: usersys.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+usersys.32.o: usersys.c  array.h file.h language.h string-private.h ../config.h
+usersys.32.o: usersys.c  debug-private.h http-private.h ../cups/http.h md5-private.h
+usersys.32.o: usersys.c  ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h
+usersys.32.o: usersys.c  pwg-private.h
+util.32.o: util.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h
+util.32.o: util.c  file.h language.h string-private.h ../config.h debug-private.h
+util.32.o: util.c  http-private.h ../cups/http.h md5-private.h ipp-private.h
+util.32.o: util.c  ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h
+testadmin.32.o: testadmin.c  adminutil.h cups.h string-private.h ../config.h
+testarray.32.o: testarray.c  string-private.h ../config.h debug-private.h array.h
+testarray.32.o: testarray.c  versioning.h dir.h
+testconflicts.32.o: testconflicts.c  cups.h string-private.h ../config.h
+testcups.32.o: testcups.c  string-private.h ../config.h cups.h
+testfile.32.o: testfile.c  string-private.h ../config.h debug-private.h file.h versioning.h
+testhttp.32.o: testhttp.c  string-private.h ../config.h http-private.h ../cups/http.h
+testhttp.32.o: testhttp.c  md5-private.h ipp-private.h ../cups/ipp.h
+testi18n.32.o: testi18n.c  string-private.h ../config.h language-private.h
+testi18n.32.o: testi18n.c  ../cups/transcode.h language.h array.h versioning.h
+testipp.32.o: testipp.c  ../cups/file.h versioning.h string-private.h ../config.h
+testipp.32.o: testipp.c  ipp-private.h ../cups/ipp.h
+testoptions.32.o: testoptions.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+testoptions.32.o: testoptions.c  array.h file.h language.h string-private.h ../config.h
+testoptions.32.o: testoptions.c  debug-private.h http-private.h ../cups/http.h md5-private.h
+testoptions.32.o: testoptions.c  ipp-private.h ../cups/ipp.h language-private.h
+testoptions.32.o: testoptions.c  ../cups/transcode.h pwg-private.h
+testlang.32.o: testlang.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+testlang.32.o: testlang.c  array.h file.h language.h string-private.h ../config.h
+testlang.32.o: testlang.c  debug-private.h http-private.h ../cups/http.h md5-private.h
+testlang.32.o: testlang.c  ipp-private.h ../cups/ipp.h language-private.h
+testlang.32.o: testlang.c  ../cups/transcode.h pwg-private.h
+testppd.32.o: testppd.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+testppd.32.o: testppd.c  array.h file.h language.h string-private.h ../config.h
+testppd.32.o: testppd.c  debug-private.h http-private.h ../cups/http.h md5-private.h
+testppd.32.o: testppd.c  ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h
+testppd.32.o: testppd.c  pwg-private.h
+testpwg.32.o: testpwg.c  pwg-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+testpwg.32.o: testpwg.c  array.h file.h language.h
+testsnmp.32.o: testsnmp.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+testsnmp.32.o: testsnmp.c  array.h file.h language.h string-private.h ../config.h
+testsnmp.32.o: testsnmp.c  debug-private.h http-private.h ../cups/http.h md5-private.h
+testsnmp.32.o: testsnmp.c  ipp-private.h ../cups/ipp.h language-private.h
+testsnmp.32.o: testsnmp.c  ../cups/transcode.h pwg-private.h snmp-private.h
 # DO NOT DELETE
 
-adminutil.64.o: adminutil.c  adminutil.h cups.h ipp.h http.h versioning.h ppd.h array.h
-adminutil.64.o: adminutil.c  file.h language.h globals.h string.h ../config.h http-private.h
-adminutil.64.o: adminutil.c  md5.h ipp-private.h i18n.h transcode.h pwg-private.h
-adminutil.64.o: adminutil.c  ../cups/cups.h debug.h
-array.64.o: array.c  array.h versioning.h string.h ../config.h debug.h
-attr.64.o: attr.c  ppd-private.h cups.h ipp.h http.h versioning.h ppd.h array.h file.h
-attr.64.o: attr.c  language.h debug.h string.h ../config.h
-auth.64.o: auth.c  globals.h string.h ../config.h http-private.h http.h versioning.h
-auth.64.o: auth.c  md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-auth.64.o: auth.c  i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h
-backchannel.64.o: backchannel.c  cups.h ipp.h http.h versioning.h ppd.h array.h file.h
-backchannel.64.o: backchannel.c  language.h
-backend.64.o: backend.c  backend.h versioning.h globals.h string.h ../config.h
-backend.64.o: backend.c  http-private.h http.h md5.h ipp-private.h ipp.h cups.h ppd.h
-backend.64.o: backend.c  array.h file.h language.h i18n.h transcode.h pwg-private.h
-backend.64.o: backend.c  ../cups/cups.h
-conflicts.64.o: conflicts.c  ppd-private.h cups.h ipp.h http.h versioning.h ppd.h array.h
-conflicts.64.o: conflicts.c  file.h language.h string.h ../config.h debug.h
-custom.64.o: custom.c  globals.h string.h ../config.h http-private.h http.h versioning.h
-custom.64.o: custom.c  md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-custom.64.o: custom.c  i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h
-debug.64.o: debug.c  globals.h string.h ../config.h http-private.h http.h versioning.h
-debug.64.o: debug.c  md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-debug.64.o: debug.c  i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h
-dest.64.o: dest.c  debug.h globals.h string.h ../config.h http-private.h http.h
-dest.64.o: dest.c  versioning.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h
-dest.64.o: dest.c  language.h i18n.h transcode.h pwg-private.h ../cups/cups.h
-dir.64.o: dir.c  dir.h versioning.h string.h ../config.h debug.h
-emit.64.o: emit.c  ppd.h array.h versioning.h file.h string.h ../config.h debug.h
-encode.64.o: encode.c  cups.h ipp.h http.h versioning.h ppd.h array.h file.h language.h
-encode.64.o: encode.c  ipp-private.h string.h ../config.h debug.h
-file.64.o: file.c  file-private.h http-private.h ../config.h http.h versioning.h md5.h
-file.64.o: file.c  ipp-private.h ipp.h globals.h string.h cups.h ppd.h array.h file.h
-file.64.o: file.c  language.h i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h
-getdevices.64.o: getdevices.c  globals.h string.h ../config.h http-private.h http.h
-getdevices.64.o: getdevices.c  versioning.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h
-getdevices.64.o: getdevices.c  file.h language.h i18n.h transcode.h pwg-private.h
-getdevices.64.o: getdevices.c  ../cups/cups.h debug.h
-getifaddrs.64.o: getifaddrs.c  http-private.h ../config.h http.h versioning.h md5.h
-getifaddrs.64.o: getifaddrs.c  ipp-private.h ipp.h
-getputfile.64.o: getputfile.c  globals.h string.h ../config.h http-private.h http.h
-getputfile.64.o: getputfile.c  versioning.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h
-getputfile.64.o: getputfile.c  file.h language.h i18n.h transcode.h pwg-private.h
-getputfile.64.o: getputfile.c  ../cups/cups.h debug.h
-globals.64.o: globals.c  http-private.h ../config.h http.h versioning.h md5.h ipp-private.h
-globals.64.o: globals.c  ipp.h globals.h string.h cups.h ppd.h array.h file.h language.h
-globals.64.o: globals.c  i18n.h transcode.h pwg-private.h ../cups/cups.h
-http.64.o: http.c  http-private.h ../config.h http.h versioning.h md5.h ipp-private.h
-http.64.o: http.c  ipp.h globals.h string.h cups.h ppd.h array.h file.h language.h
-http.64.o: http.c  i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h
-http-addr.64.o: http-addr.c  http-private.h ../config.h http.h versioning.h md5.h
-http-addr.64.o: http-addr.c  ipp-private.h ipp.h globals.h string.h cups.h ppd.h array.h
-http-addr.64.o: http-addr.c  file.h language.h i18n.h transcode.h pwg-private.h
-http-addr.64.o: http-addr.c  ../cups/cups.h debug.h
-http-addrlist.64.o: http-addrlist.c  http-private.h ../config.h http.h versioning.h md5.h
-http-addrlist.64.o: http-addrlist.c  ipp-private.h ipp.h globals.h string.h cups.h ppd.h array.h
-http-addrlist.64.o: http-addrlist.c  file.h language.h i18n.h transcode.h pwg-private.h
-http-addrlist.64.o: http-addrlist.c  ../cups/cups.h debug.h
-http-support.64.o: http-support.c  debug.h globals.h string.h ../config.h http-private.h http.h
-http-support.64.o: http-support.c  versioning.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h
-http-support.64.o: http-support.c  file.h language.h i18n.h transcode.h pwg-private.h
-http-support.64.o: http-support.c  ../cups/cups.h
-ipp.64.o: ipp.c  http-private.h ../config.h http.h versioning.h md5.h ipp-private.h
-ipp.64.o: ipp.c  ipp.h globals.h string.h cups.h ppd.h array.h file.h language.h i18n.h
-ipp.64.o: ipp.c  transcode.h pwg-private.h ../cups/cups.h debug.h
-ipp-support.64.o: ipp-support.c  globals.h string.h ../config.h http-private.h http.h
-ipp-support.64.o: ipp-support.c  versioning.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h
-ipp-support.64.o: ipp-support.c  file.h language.h i18n.h transcode.h pwg-private.h
-ipp-support.64.o: ipp-support.c  ../cups/cups.h debug.h
-langprintf.64.o: langprintf.c  globals.h string.h ../config.h http-private.h http.h
-langprintf.64.o: langprintf.c  versioning.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h
-langprintf.64.o: langprintf.c  file.h language.h i18n.h transcode.h pwg-private.h
-langprintf.64.o: langprintf.c  ../cups/cups.h
-language.64.o: language.c  globals.h string.h ../config.h http-private.h http.h versioning.h
-language.64.o: language.c  md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-language.64.o: language.c  i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h
-localize.64.o: localize.c  globals.h string.h ../config.h http-private.h http.h versioning.h
-localize.64.o: localize.c  md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-localize.64.o: localize.c  i18n.h transcode.h pwg-private.h ../cups/cups.h ppd-private.h
-localize.64.o: localize.c  debug.h
-mark.64.o: mark.c  cups.h ipp.h http.h versioning.h ppd.h array.h file.h language.h
-mark.64.o: mark.c  string.h ../config.h debug.h pwg-private.h ../cups/cups.h
-md5.64.o: md5.c  md5.h string.h ../config.h
-md5passwd.64.o: md5passwd.c  http-private.h ../config.h http.h versioning.h md5.h
-md5passwd.64.o: md5passwd.c  ipp-private.h ipp.h string.h
-notify.64.o: notify.c  globals.h string.h ../config.h http-private.h http.h versioning.h
-notify.64.o: notify.c  md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-notify.64.o: notify.c  i18n.h transcode.h pwg-private.h ../cups/cups.h
-options.64.o: options.c  cups.h ipp.h http.h versioning.h ppd.h array.h file.h language.h
-options.64.o: options.c  string.h ../config.h debug.h
-page.64.o: page.c  ppd.h array.h versioning.h file.h string.h ../config.h debug.h
-ppd.64.o: ppd.c  ppd-private.h cups.h ipp.h http.h versioning.h ppd.h array.h file.h
-ppd.64.o: ppd.c  language.h pwg-private.h ../cups/cups.h globals.h string.h ../config.h
-ppd.64.o: ppd.c  http-private.h md5.h ipp-private.h i18n.h transcode.h debug.h
-pwg-file.64.o: pwg-file.c  pwg-private.h ../cups/cups.h globals.h string.h ../config.h
-pwg-file.64.o: pwg-file.c  http-private.h http.h versioning.h md5.h ipp-private.h ipp.h
-pwg-file.64.o: pwg-file.c  cups.h ppd.h array.h file.h language.h i18n.h transcode.h debug.h
-pwg-media.64.o: pwg-media.c  pwg-private.h ../cups/cups.h globals.h string.h ../config.h
-pwg-media.64.o: pwg-media.c  http-private.h http.h versioning.h md5.h ipp-private.h ipp.h
-pwg-media.64.o: pwg-media.c  cups.h ppd.h array.h file.h language.h i18n.h transcode.h
-pwg-media.64.o: pwg-media.c  debug.h
-pwg-ppd.64.o: pwg-ppd.c  pwg-private.h ../cups/cups.h globals.h string.h ../config.h
-pwg-ppd.64.o: pwg-ppd.c  http-private.h http.h versioning.h md5.h ipp-private.h ipp.h
-pwg-ppd.64.o: pwg-ppd.c  cups.h ppd.h array.h file.h language.h i18n.h transcode.h debug.h
-request.64.o: request.c  globals.h string.h ../config.h http-private.h http.h versioning.h
-request.64.o: request.c  md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-request.64.o: request.c  i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h
-sidechannel.64.o: sidechannel.c  sidechannel.h versioning.h string.h ../config.h debug.h
-snmp.64.o: snmp.c  globals.h string.h ../config.h http-private.h http.h versioning.h
-snmp.64.o: snmp.c  md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-snmp.64.o: snmp.c  i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h
+adminutil.64.o: adminutil.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+adminutil.64.o: adminutil.c  array.h file.h language.h string-private.h ../config.h
+adminutil.64.o: adminutil.c  debug-private.h http-private.h ../cups/http.h md5-private.h
+adminutil.64.o: adminutil.c  ipp-private.h ../cups/ipp.h language-private.h
+adminutil.64.o: adminutil.c  ../cups/transcode.h pwg-private.h adminutil.h cups.h
+array.64.o: array.c  string-private.h ../config.h debug-private.h array.h versioning.h
+attr.64.o: attr.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h
+attr.64.o: attr.c  file.h language.h string-private.h ../config.h debug-private.h
+attr.64.o: attr.c  http-private.h ../cups/http.h md5-private.h ipp-private.h
+attr.64.o: attr.c  ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h
+attr.64.o: attr.c  ppd-private.h
+auth.64.o: auth.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h
+auth.64.o: auth.c  file.h language.h string-private.h ../config.h debug-private.h
+auth.64.o: auth.c  http-private.h ../cups/http.h md5-private.h ipp-private.h
+auth.64.o: auth.c  ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h
+backchannel.64.o: backchannel.c  cups.h
+backend.64.o: backend.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+backend.64.o: backend.c  array.h file.h language.h string-private.h ../config.h
+backend.64.o: backend.c  debug-private.h http-private.h ../cups/http.h md5-private.h
+backend.64.o: backend.c  ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h
+backend.64.o: backend.c  pwg-private.h backend.h
+conflicts.64.o: conflicts.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+conflicts.64.o: conflicts.c  array.h file.h language.h string-private.h ../config.h
+conflicts.64.o: conflicts.c  debug-private.h http-private.h ../cups/http.h md5-private.h
+conflicts.64.o: conflicts.c  ipp-private.h ../cups/ipp.h language-private.h
+conflicts.64.o: conflicts.c  ../cups/transcode.h pwg-private.h ppd-private.h
+custom.64.o: custom.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+custom.64.o: custom.c  array.h file.h language.h string-private.h ../config.h
+custom.64.o: custom.c  debug-private.h http-private.h ../cups/http.h md5-private.h
+custom.64.o: custom.c  ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h
+custom.64.o: custom.c  pwg-private.h
+debug.64.o: debug.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+debug.64.o: debug.c  array.h file.h language.h string-private.h ../config.h
+debug.64.o: debug.c  debug-private.h http-private.h ../cups/http.h md5-private.h
+debug.64.o: debug.c  ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h
+debug.64.o: debug.c  pwg-private.h
+dest.64.o: dest.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h
+dest.64.o: dest.c  file.h language.h string-private.h ../config.h debug-private.h
+dest.64.o: dest.c  http-private.h ../cups/http.h md5-private.h ipp-private.h
+dest.64.o: dest.c  ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h
+dir.64.o: dir.c  string-private.h ../config.h debug-private.h dir.h versioning.h
+emit.64.o: emit.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h
+emit.64.o: emit.c  file.h language.h string-private.h ../config.h debug-private.h
+emit.64.o: emit.c  http-private.h ../cups/http.h md5-private.h ipp-private.h
+emit.64.o: emit.c  ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h
+encode.64.o: encode.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+encode.64.o: encode.c  array.h file.h language.h string-private.h ../config.h
+encode.64.o: encode.c  debug-private.h http-private.h ../cups/http.h md5-private.h
+encode.64.o: encode.c  ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h
+encode.64.o: encode.c  pwg-private.h
+file.64.o: file.c  file-private.h cups-private.h ../cups/cups.h ipp.h http.h
+file.64.o: file.c  versioning.h ppd.h array.h file.h language.h string-private.h
+file.64.o: file.c  ../config.h debug-private.h http-private.h ../cups/http.h
+file.64.o: file.c  md5-private.h ipp-private.h ../cups/ipp.h language-private.h
+file.64.o: file.c  ../cups/transcode.h pwg-private.h
+getdevices.64.o: getdevices.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+getdevices.64.o: getdevices.c  array.h file.h language.h string-private.h ../config.h
+getdevices.64.o: getdevices.c  debug-private.h http-private.h ../cups/http.h md5-private.h
+getdevices.64.o: getdevices.c  ipp-private.h ../cups/ipp.h language-private.h
+getdevices.64.o: getdevices.c  ../cups/transcode.h pwg-private.h
+getifaddrs.64.o: getifaddrs.c  http-private.h ../config.h ../cups/http.h md5-private.h
+getifaddrs.64.o: getifaddrs.c  ipp-private.h ../cups/ipp.h
+getputfile.64.o: getputfile.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+getputfile.64.o: getputfile.c  array.h file.h language.h string-private.h ../config.h
+getputfile.64.o: getputfile.c  debug-private.h http-private.h ../cups/http.h md5-private.h
+getputfile.64.o: getputfile.c  ipp-private.h ../cups/ipp.h language-private.h
+getputfile.64.o: getputfile.c  ../cups/transcode.h pwg-private.h
+globals.64.o: globals.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+globals.64.o: globals.c  array.h file.h language.h string-private.h ../config.h
+globals.64.o: globals.c  debug-private.h http-private.h ../cups/http.h md5-private.h
+globals.64.o: globals.c  ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h
+globals.64.o: globals.c  pwg-private.h
+http.64.o: http.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h
+http.64.o: http.c  file.h language.h string-private.h ../config.h debug-private.h
+http.64.o: http.c  http-private.h ../cups/http.h md5-private.h ipp-private.h
+http.64.o: http.c  ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h
+http-addr.64.o: http-addr.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+http-addr.64.o: http-addr.c  array.h file.h language.h string-private.h ../config.h
+http-addr.64.o: http-addr.c  debug-private.h http-private.h ../cups/http.h md5-private.h
+http-addr.64.o: http-addr.c  ipp-private.h ../cups/ipp.h language-private.h
+http-addr.64.o: http-addr.c  ../cups/transcode.h pwg-private.h
+http-addrlist.64.o: http-addrlist.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h
+http-addrlist.64.o: http-addrlist.c  ppd.h array.h file.h language.h string-private.h ../config.h
+http-addrlist.64.o: http-addrlist.c  debug-private.h http-private.h ../cups/http.h md5-private.h
+http-addrlist.64.o: http-addrlist.c  ipp-private.h ../cups/ipp.h language-private.h
+http-addrlist.64.o: http-addrlist.c  ../cups/transcode.h pwg-private.h
+http-support.64.o: http-support.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+http-support.64.o: http-support.c  array.h file.h language.h string-private.h ../config.h
+http-support.64.o: http-support.c  debug-private.h http-private.h ../cups/http.h md5-private.h
+http-support.64.o: http-support.c  ipp-private.h ../cups/ipp.h language-private.h
+http-support.64.o: http-support.c  ../cups/transcode.h pwg-private.h
+ipp.64.o: ipp.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h
+ipp.64.o: ipp.c  file.h language.h string-private.h ../config.h debug-private.h
+ipp.64.o: ipp.c  http-private.h ../cups/http.h md5-private.h ipp-private.h
+ipp.64.o: ipp.c  ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h
+ipp-support.64.o: ipp-support.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+ipp-support.64.o: ipp-support.c  array.h file.h language.h string-private.h ../config.h
+ipp-support.64.o: ipp-support.c  debug-private.h http-private.h ../cups/http.h md5-private.h
+ipp-support.64.o: ipp-support.c  ipp-private.h ../cups/ipp.h language-private.h
+ipp-support.64.o: ipp-support.c  ../cups/transcode.h pwg-private.h
+langprintf.64.o: langprintf.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+langprintf.64.o: langprintf.c  array.h file.h language.h string-private.h ../config.h
+langprintf.64.o: langprintf.c  debug-private.h http-private.h ../cups/http.h md5-private.h
+langprintf.64.o: langprintf.c  ipp-private.h ../cups/ipp.h language-private.h
+langprintf.64.o: langprintf.c  ../cups/transcode.h pwg-private.h
+language.64.o: language.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+language.64.o: language.c  array.h file.h language.h string-private.h ../config.h
+language.64.o: language.c  debug-private.h http-private.h ../cups/http.h md5-private.h
+language.64.o: language.c  ipp-private.h ../cups/ipp.h language-private.h
+language.64.o: language.c  ../cups/transcode.h pwg-private.h
+localize.64.o: localize.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+localize.64.o: localize.c  array.h file.h language.h string-private.h ../config.h
+localize.64.o: localize.c  debug-private.h http-private.h ../cups/http.h md5-private.h
+localize.64.o: localize.c  ipp-private.h ../cups/ipp.h language-private.h
+localize.64.o: localize.c  ../cups/transcode.h pwg-private.h ppd-private.h
+mark.64.o: mark.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h
+mark.64.o: mark.c  file.h language.h string-private.h ../config.h debug-private.h
+mark.64.o: mark.c  http-private.h ../cups/http.h md5-private.h ipp-private.h
+mark.64.o: mark.c  ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h
+md5.64.o: md5.c  md5-private.h string-private.h ../config.h
+md5passwd.64.o: md5passwd.c  http-private.h ../config.h ../cups/http.h md5-private.h
+md5passwd.64.o: md5passwd.c  ipp-private.h ../cups/ipp.h string-private.h
+notify.64.o: notify.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+notify.64.o: notify.c  array.h file.h language.h string-private.h ../config.h
+notify.64.o: notify.c  debug-private.h http-private.h ../cups/http.h md5-private.h
+notify.64.o: notify.c  ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h
+notify.64.o: notify.c  pwg-private.h
+options.64.o: options.c  cups.h string-private.h ../config.h debug-private.h
+page.64.o: page.c  string-private.h ../config.h debug-private.h ppd.h array.h
+page.64.o: page.c  versioning.h file.h
+ppd.64.o: ppd.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h
+ppd.64.o: ppd.c  file.h language.h string-private.h ../config.h debug-private.h
+ppd.64.o: ppd.c  http-private.h ../cups/http.h md5-private.h ipp-private.h
+ppd.64.o: ppd.c  ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h
+ppd.64.o: ppd.c  ppd-private.h
+pwg-file.64.o: pwg-file.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+pwg-file.64.o: pwg-file.c  array.h file.h language.h string-private.h ../config.h
+pwg-file.64.o: pwg-file.c  debug-private.h http-private.h ../cups/http.h md5-private.h
+pwg-file.64.o: pwg-file.c  ipp-private.h ../cups/ipp.h language-private.h
+pwg-file.64.o: pwg-file.c  ../cups/transcode.h pwg-private.h
+pwg-media.64.o: pwg-media.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+pwg-media.64.o: pwg-media.c  array.h file.h language.h string-private.h ../config.h
+pwg-media.64.o: pwg-media.c  debug-private.h http-private.h ../cups/http.h md5-private.h
+pwg-media.64.o: pwg-media.c  ipp-private.h ../cups/ipp.h language-private.h
+pwg-media.64.o: pwg-media.c  ../cups/transcode.h pwg-private.h
+pwg-ppd.64.o: pwg-ppd.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+pwg-ppd.64.o: pwg-ppd.c  array.h file.h language.h string-private.h ../config.h
+pwg-ppd.64.o: pwg-ppd.c  debug-private.h http-private.h ../cups/http.h md5-private.h
+pwg-ppd.64.o: pwg-ppd.c  ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h
+pwg-ppd.64.o: pwg-ppd.c  pwg-private.h
+request.64.o: request.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+request.64.o: request.c  array.h file.h language.h string-private.h ../config.h
+request.64.o: request.c  debug-private.h http-private.h ../cups/http.h md5-private.h
+request.64.o: request.c  ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h
+request.64.o: request.c  pwg-private.h
+sidechannel.64.o: sidechannel.c  sidechannel.h versioning.h string-private.h ../config.h
+sidechannel.64.o: sidechannel.c  debug-private.h
+snmp.64.o: snmp.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h
+snmp.64.o: snmp.c  file.h language.h string-private.h ../config.h debug-private.h
+snmp.64.o: snmp.c  http-private.h ../cups/http.h md5-private.h ipp-private.h
+snmp.64.o: snmp.c  ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h
 snmp.64.o: snmp.c  snmp-private.h
-snprintf.64.o: snprintf.c  string.h ../config.h
-string.64.o: string.c  array.h versioning.h debug.h string.h ../config.h
-tempfile.64.o: tempfile.c  globals.h string.h ../config.h http-private.h http.h versioning.h
-tempfile.64.o: tempfile.c  md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-tempfile.64.o: tempfile.c  i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h
-transcode.64.o: transcode.c  globals.h string.h ../config.h http-private.h http.h
-transcode.64.o: transcode.c  versioning.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h
-transcode.64.o: transcode.c  file.h language.h i18n.h transcode.h pwg-private.h
-transcode.64.o: transcode.c  ../cups/cups.h debug.h
-usersys.64.o: usersys.c  http-private.h ../config.h http.h versioning.h md5.h ipp-private.h
-usersys.64.o: usersys.c  ipp.h globals.h string.h cups.h ppd.h array.h file.h language.h
-usersys.64.o: usersys.c  i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h
-util.64.o: util.c  globals.h string.h ../config.h http-private.h http.h versioning.h
-util.64.o: util.c  md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-util.64.o: util.c  i18n.h transcode.h pwg-private.h ../cups/cups.h debug.h
-testadmin.64.o: testadmin.c  adminutil.h cups.h ipp.h http.h versioning.h ppd.h array.h
-testadmin.64.o: testadmin.c  file.h language.h string.h ../config.h
-testarray.64.o: testarray.c  ../cups/string.h ../config.h string.h array.h versioning.h dir.h
-testarray.64.o: testarray.c  debug.h
-testconflicts.64.o: testconflicts.c  cups.h ipp.h http.h versioning.h ppd.h array.h file.h
-testconflicts.64.o: testconflicts.c  language.h string.h ../config.h
-testcups.64.o: testcups.c  cups.h ipp.h http.h versioning.h ppd.h array.h file.h language.h
-testcups.64.o: testcups.c  string.h ../config.h
-testfile.64.o: testfile.c  string.h ../config.h file.h versioning.h debug.h
-testhttp.64.o: testhttp.c  http-private.h ../config.h http.h versioning.h md5.h
-testhttp.64.o: testhttp.c  ipp-private.h ipp.h string.h
-testi18n.64.o: testi18n.c  i18n.h transcode.h language.h array.h versioning.h string.h
-testi18n.64.o: testi18n.c  ../config.h
-testipp.64.o: testipp.c  ../cups/string.h ../config.h string.h ipp-private.h ipp.h http.h
-testipp.64.o: testipp.c  versioning.h
-testoptions.64.o: testoptions.c  string.h ../config.h cups.h ipp.h http.h versioning.h ppd.h
-testoptions.64.o: testoptions.c  array.h file.h language.h
-testlang.64.o: testlang.c  i18n.h transcode.h language.h array.h versioning.h string.h
-testlang.64.o: testlang.c  ../config.h
-testppd.64.o: testppd.c  ../cups/cups.h ../cups/string.h ../config.h string.h
-testpwg.64.o: testpwg.c  pwg-private.h ../cups/cups.h
-testsnmp.64.o: testsnmp.c  string.h ../config.h snmp-private.h http.h versioning.h
+snprintf.64.o: snprintf.c  string-private.h ../config.h
+string.64.o: string.c  string-private.h ../config.h debug-private.h array.h versioning.h
+tempfile.64.o: tempfile.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+tempfile.64.o: tempfile.c  array.h file.h language.h string-private.h ../config.h
+tempfile.64.o: tempfile.c  debug-private.h http-private.h ../cups/http.h md5-private.h
+tempfile.64.o: tempfile.c  ipp-private.h ../cups/ipp.h language-private.h
+tempfile.64.o: tempfile.c  ../cups/transcode.h pwg-private.h
+transcode.64.o: transcode.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+transcode.64.o: transcode.c  array.h file.h language.h string-private.h ../config.h
+transcode.64.o: transcode.c  debug-private.h http-private.h ../cups/http.h md5-private.h
+transcode.64.o: transcode.c  ipp-private.h ../cups/ipp.h language-private.h
+transcode.64.o: transcode.c  ../cups/transcode.h pwg-private.h
+usersys.64.o: usersys.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+usersys.64.o: usersys.c  array.h file.h language.h string-private.h ../config.h
+usersys.64.o: usersys.c  debug-private.h http-private.h ../cups/http.h md5-private.h
+usersys.64.o: usersys.c  ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h
+usersys.64.o: usersys.c  pwg-private.h
+util.64.o: util.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h
+util.64.o: util.c  file.h language.h string-private.h ../config.h debug-private.h
+util.64.o: util.c  http-private.h ../cups/http.h md5-private.h ipp-private.h
+util.64.o: util.c  ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h
+testadmin.64.o: testadmin.c  adminutil.h cups.h string-private.h ../config.h
+testarray.64.o: testarray.c  string-private.h ../config.h debug-private.h array.h
+testarray.64.o: testarray.c  versioning.h dir.h
+testconflicts.64.o: testconflicts.c  cups.h string-private.h ../config.h
+testcups.64.o: testcups.c  string-private.h ../config.h cups.h
+testfile.64.o: testfile.c  string-private.h ../config.h debug-private.h file.h versioning.h
+testhttp.64.o: testhttp.c  string-private.h ../config.h http-private.h ../cups/http.h
+testhttp.64.o: testhttp.c  md5-private.h ipp-private.h ../cups/ipp.h
+testi18n.64.o: testi18n.c  string-private.h ../config.h language-private.h
+testi18n.64.o: testi18n.c  ../cups/transcode.h language.h array.h versioning.h
+testipp.64.o: testipp.c  ../cups/file.h versioning.h string-private.h ../config.h
+testipp.64.o: testipp.c  ipp-private.h ../cups/ipp.h
+testoptions.64.o: testoptions.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+testoptions.64.o: testoptions.c  array.h file.h language.h string-private.h ../config.h
+testoptions.64.o: testoptions.c  debug-private.h http-private.h ../cups/http.h md5-private.h
+testoptions.64.o: testoptions.c  ipp-private.h ../cups/ipp.h language-private.h
+testoptions.64.o: testoptions.c  ../cups/transcode.h pwg-private.h
+testlang.64.o: testlang.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+testlang.64.o: testlang.c  array.h file.h language.h string-private.h ../config.h
+testlang.64.o: testlang.c  debug-private.h http-private.h ../cups/http.h md5-private.h
+testlang.64.o: testlang.c  ipp-private.h ../cups/ipp.h language-private.h
+testlang.64.o: testlang.c  ../cups/transcode.h pwg-private.h
+testppd.64.o: testppd.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+testppd.64.o: testppd.c  array.h file.h language.h string-private.h ../config.h
+testppd.64.o: testppd.c  debug-private.h http-private.h ../cups/http.h md5-private.h
+testppd.64.o: testppd.c  ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h
+testppd.64.o: testppd.c  pwg-private.h
+testpwg.64.o: testpwg.c  pwg-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+testpwg.64.o: testpwg.c  array.h file.h language.h
+testsnmp.64.o: testsnmp.c  cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
+testsnmp.64.o: testsnmp.c  array.h file.h language.h string-private.h ../config.h
+testsnmp.64.o: testsnmp.c  debug-private.h http-private.h ../cups/http.h md5-private.h
+testsnmp.64.o: testsnmp.c  ipp-private.h ../cups/ipp.h language-private.h
+testsnmp.64.o: testsnmp.c  ../cups/transcode.h pwg-private.h snmp-private.h
diff --git a/cups/Makefile b/cups/Makefile
index ef408df24..dba1ce60e 100644
--- a/cups/Makefile
+++ b/cups/Makefile
@@ -110,6 +110,18 @@ HEADERS	=	\
 		transcode.h \
 		versioning.h
 
+HEADERSPRIV =	\
+		cups-private.h \
+		debug-private.h \
+		file-private.h \
+		http-private.h \
+		ipp-private.h \
+		language-private.h \
+		md5-private.h \
+		ppd-private.h \
+		pwg-private.h \
+		snmp-private.h \
+		string-private.h
 
 #
 # Targets in this directory...
@@ -216,6 +228,13 @@ install-headers:
 	for file in $(HEADERS); do \
 		$(INSTALL_DATA) $$file $(INCLUDEDIR)/cups; \
 	done
+	if test "x$(privateinclude)" != x; then \
+		echo Installing private header files into $(PRIVATEINCLUDE)...; \
+		$(INSTALLDIR) -m 755 $(PRIVATEINCLUDE); \
+		for file in $(HEADERSPRIV); do \
+			$(INSTALL_DATA) $$file $(PRIVATEINCLUDE); \
+		done; \
+	fi
 
 
 #
diff --git a/cups/adminutil.c b/cups/adminutil.c
index 4db5247ec..d0121a71e 100644
--- a/cups/adminutil.c
+++ b/cups/adminutil.c
@@ -1,8 +1,7 @@
 /*
  * "$Id: adminutil.c 7850 2008-08-20 00:07:25Z mike $"
  *
- *   Administration utility API definitions for the Common UNIX Printing
- *   System (CUPS).
+ *   Administration utility API definitions for CUPS.
  *
  *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 2001-2007 by Easy Software Products.
@@ -33,10 +32,8 @@
  * Include necessary headers...
  */
 
+#include "cups-private.h"
 #include "adminutil.h"
-#include "globals.h"
-#include "debug.h"
-#include <errno.h>
 #include <fcntl.h>
 #include <sys/stat.h>
 #ifdef WIN32
diff --git a/cups/api-cups.shtml b/cups/api-cups.shtml
index 7a653d4a8..ca251e654 100644
--- a/cups/api-cups.shtml
+++ b/cups/api-cups.shtml
@@ -3,7 +3,7 @@
 
   CUPS API introduction for the Common UNIX Printing System (CUPS).
 
-  Copyright 2007-2008 by Apple Inc.
+  Copyright 2007-2010 by Apple Inc.
   Copyright 1997-2006 by Easy Software Products, all rights reserved.
 
   These coded instructions, statements, and computer programs are the
@@ -82,12 +82,13 @@ instance will return the default instance for that destination.</p>
 </tr>
 <tr>
 	<td>"printer-is-accepting-jobs"</td>
-	<td>"1" if the destination is accepting new jobs, "0" if not.</td>
+	<td>"true" if the destination is accepting new jobs, "false" if
+	not.</td>
 </tr>
 <tr>
 	<td>"printer-is-shared"</td>
-	<td>"1" if the destination is being shared with other computers, "0" if
-	not.</td>
+	<td>"true" if the destination is being shared with other computers,
+	"false" if not.</td>
 </tr>
 <tr>
 	<td>"printer-location"</td>
diff --git a/cups/array.c b/cups/array.c
index 957ed913b..5b9a8ce37 100644
--- a/cups/array.c
+++ b/cups/array.c
@@ -1,9 +1,9 @@
 /*
  * "$Id: array.c 7616 2008-05-28 00:34:13Z mike $"
  *
- *   Sorted array routines for the Common UNIX Printing System (CUPS).
+ *   Sorted array routines for CUPS.
  *
- *   Copyright 2007-2009 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -45,9 +45,9 @@
  * Include necessary headers...
  */
 
+#include "string-private.h"
+#include "debug-private.h"
 #include "array.h"
-#include "string.h"
-#include "debug.h"
 
 
 /*
diff --git a/cups/attr.c b/cups/attr.c
index 2cae04f3d..d8dff2094 100644
--- a/cups/attr.c
+++ b/cups/attr.c
@@ -23,10 +23,8 @@
  * Include necessary headers...
  */
 
+#include "cups-private.h"
 #include "ppd-private.h"
-#include "debug.h"
-#include "string.h"
-#include <stdlib.h>
 
 
 /*
diff --git a/cups/auth.c b/cups/auth.c
index 63e5ed282..b496ddeff 100644
--- a/cups/auth.c
+++ b/cups/auth.c
@@ -1,7 +1,7 @@
 /*
  * "$Id: auth.c 7720 2008-07-11 22:46:21Z mike $"
  *
- *   Authentication functions for the Common UNIX Printing System (CUPS).
+ *   Authentication functions for CUPS.
  *
  *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
@@ -30,11 +30,7 @@
  * Include necessary headers...
  */
 
-#include "globals.h"
-#include "debug.h"
-#include <stdlib.h>
-#include <ctype.h>
-#include <errno.h>
+#include "cups-private.h"
 #include <fcntl.h>
 #include <sys/stat.h>
 #if defined(WIN32) || defined(__EMX__)
diff --git a/cups/backchannel.c b/cups/backchannel.c
index 44d8b574b..496b1f768 100644
--- a/cups/backchannel.c
+++ b/cups/backchannel.c
@@ -1,9 +1,9 @@
 /*
  * "$Id: backchannel.c 7616 2008-05-28 00:34:13Z mike $"
  *
- *   Backchannel functions for the Common UNIX Printing System (CUPS).
+ *   Backchannel functions for CUPS.
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
diff --git a/cups/backend.c b/cups/backend.c
index 2df7b697d..83613ea20 100644
--- a/cups/backend.c
+++ b/cups/backend.c
@@ -1,9 +1,9 @@
 /*
  * "$Id: backend.c 7810 2008-07-29 01:11:15Z mike $"
  *
- *   Backend functions for the Common UNIX Printing System (CUPS).
+ *   Backend functions for CUPS.
  *
- *   Copyright 2007-2009 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -25,9 +25,8 @@
  * Include necessary headers...
  */
 
-#include <stdlib.h>
+#include "cups-private.h"
 #include "backend.h"
-#include "globals.h"
 
 
 /*
diff --git a/cups/conflicts.c b/cups/conflicts.c
index 3b3f556c5..7e7a72268 100644
--- a/cups/conflicts.c
+++ b/cups/conflicts.c
@@ -1,9 +1,9 @@
 /*
  * "$Id$"
  *
- *   Option marking routines for the Common UNIX Printing System (CUPS).
+ *   Option marking routines for CUPS.
  *
- *   Copyright 2007-2009 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -35,9 +35,8 @@
  * Include necessary headers...
  */
 
+#include "cups-private.h"
 #include "ppd-private.h"
-#include "string.h"
-#include "debug.h"
 
 
 /*
diff --git a/cups/globals.h b/cups/cups-private.h
index 0b599987e..c23803399 100644
--- a/cups/globals.h
+++ b/cups/cups-private.h
@@ -1,9 +1,9 @@
 /*
- * "$Id: globals.h 7910 2008-09-06 00:25:17Z mike $"
+ * "$Id$"
  *
- *   Global variable definitions for the Common UNIX Printing System (CUPS).
+ *   Private definitions for CUPS.
  *
- *   Copyright 2007-2009 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -15,19 +15,20 @@
  *   This file is subject to the Apple OS-Developed Software exception.
  */
 
-#ifndef _CUPS_GLOBALS_H_
-#  define _CUPS_GLOBALS_H_
+#ifndef _CUPS_CUPS_PRIVATE_H_
+#  define _CUPS_CUPS_PRIVATE_H_
 
 /*
  * Include necessary headers...
  */
 
-#  include "string.h"
+#  include <cups/cups.h>
+#  include "string-private.h"
+#  include "debug-private.h"
 #  include "http-private.h"
-#  include "cups.h"
-#  include "i18n.h"
+#  include "ipp-private.h"
+#  include "language-private.h"
 #  include "pwg-private.h"
-
 #  ifdef HAVE_PTHREAD_H
 #    include <pthread.h>
 #  endif /* HAVE_PTHREAD_H */
@@ -43,8 +44,7 @@ extern "C" {
 
 
 /*
- * To make libcups thread safe, define thread safe globals (aka thread-
- * specific data) for the static variables used in the library.
+ * Types...
  */
 
 typedef struct _cups_globals_s		/**** CUPS global state data ****/
@@ -163,8 +163,8 @@ extern char		*_cupsUserDefault(char *name, size_t namesize);
 #  ifdef __cplusplus
 }
 #  endif /* __cplusplus */
-#endif /* !_CUPS_GLOBALS_H_ */
+#endif /* !_CUPS_CUPS_PRIVATE_H_ */
 
 /*
- * End of "$Id: globals.h 7910 2008-09-06 00:25:17Z mike $".
+ * End of "$Id$".
  */
diff --git a/cups/custom.c b/cups/custom.c
index 7ca3a900a..9826ad241 100644
--- a/cups/custom.c
+++ b/cups/custom.c
@@ -1,9 +1,9 @@
 /*
  * "$Id: custom.c 6649 2007-07-11 21:46:42Z mike $"
  *
- *   PPD custom option routines for the Common UNIX Printing System (CUPS).
+ *   PPD custom option routines for CUPS.
  *
- *   Copyright 2007 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -35,8 +35,7 @@
  * Include necessary headers.
  */
 
-#include "globals.h"
-#include "debug.h"
+#include "cups-private.h"
 
 
 /*
diff --git a/cups/debug.h b/cups/debug-private.h
index e051be4f7..6d56f9b00 100644
--- a/cups/debug.h
+++ b/cups/debug-private.h
@@ -1,9 +1,9 @@
 /*
- * "$Id: debug.h 7701 2008-06-27 22:37:23Z mike $"
+ * "$Id$"
  *
- *   Debugging macros for the Common UNIX Printing System (CUPS).
+ *   Private debugging macros for CUPS.
  *
- *   Copyright 2007-2009 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 1997-2005 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -15,8 +15,8 @@
  *   This file is subject to the Apple OS-Developed Software exception.
  */
 
-#ifndef _CUPS_DEBUG_H_
-#  define _CUPS_DEBUG_H_
+#ifndef _CUPS_DEBUG_PRIVATE_H_
+#  define _CUPS_DEBUG_PRIVATE_H_
 
 /*
  * C++ magic...
@@ -82,8 +82,8 @@ extern void	_cups_debug_puts(const char *s);
 }
 #  endif /* __cplusplus */
 
-#endif /* !_CUPS_DEBUG_H_ */
+#endif /* !_CUPS_DEBUG_PRIVATE_H_ */
 
 /*
- * End of "$Id: debug.h 7701 2008-06-27 22:37:23Z mike $".
+ * End of "$Id$".
  */
diff --git a/cups/debug.c b/cups/debug.c
index 137edffc4..fe170d707 100644
--- a/cups/debug.c
+++ b/cups/debug.c
@@ -1,9 +1,9 @@
 /*
  * "$Id$"
  *
- *   Debugging functions for the Common UNIX Printing System (CUPS).
+ *   Debugging functions for CUPS.
  *
- *   Copyright 2008-2009 by Apple Inc.
+ *   Copyright 2008-2010 by Apple Inc.
  *
  *   These coded instructions, statements, and computer programs are the
  *   property of Apple Inc. and are protected by Federal copyright
@@ -24,8 +24,7 @@
  * Include necessary headers...
  */
 
-#include "globals.h"
-#include "debug.h"
+#include "cups-private.h"
 #ifdef WIN32
 #  include <io.h>
 #else
diff --git a/cups/dest.c b/cups/dest.c
index 3be713087..191ec7b84 100644
--- a/cups/dest.c
+++ b/cups/dest.c
@@ -1,8 +1,7 @@
 /*
  * "$Id: dest.c 7946 2008-09-16 23:27:54Z mike $"
  *
- *   User-defined destination (and option) support for the Common UNIX
- *   Printing System (CUPS).
+ *   User-defined destination (and option) support for CUPS.
  *
  *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
@@ -51,11 +50,7 @@
  * Include necessary headers...
  */
 
-#include "debug.h"
-#include "globals.h"
-#include "pwg-private.h"
-#include <stdlib.h>
-#include <ctype.h>
+#include "cups-private.h"
 #include <sys/stat.h>
 
 #ifdef HAVE_NOTIFY_H
diff --git a/cups/dir.c b/cups/dir.c
index 73090941e..67349595b 100644
--- a/cups/dir.c
+++ b/cups/dir.c
@@ -1,11 +1,11 @@
 /*
  * "$Id: dir.c 7279 2008-01-31 01:50:44Z mike $"
  *
- *   Public directory routines for the Common UNIX Printing System (CUPS).
+ *   Directory routines for CUPS.
  *
  *   This set of APIs abstracts enumeration of directory entries.
  *
- *   Copyright 2007-2009 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 1997-2005 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -31,11 +31,9 @@
  * Include necessary headers...
  */
 
+#include "string-private.h"
+#include "debug-private.h"
 #include "dir.h"
-#include "string.h"
-#include "debug.h"
-#include <stdlib.h>
-#include <errno.h>
 
 
 /*
diff --git a/cups/emit.c b/cups/emit.c
index b099ce170..cc8bdddfe 100644
--- a/cups/emit.c
+++ b/cups/emit.c
@@ -1,9 +1,9 @@
 /*
  * "$Id: emit.c 7863 2008-08-26 03:39:59Z mike $"
  *
- *   PPD code emission routines for the Common UNIX Printing System (CUPS).
+ *   PPD code emission routines for CUPS.
  *
- *   Copyright 2007-2009 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -38,12 +38,7 @@
  * Include necessary headers...
  */
 
-#include "ppd.h"
-#include <stdlib.h>
-#include "string.h"
-#include <errno.h>
-#include "debug.h"
-
+#include "cups-private.h"
 #if defined(WIN32) || defined(__EMX__)
 #  include <io.h>
 #else
diff --git a/cups/encode.c b/cups/encode.c
index 3bdcbba05..dfce906aa 100644
--- a/cups/encode.c
+++ b/cups/encode.c
@@ -1,9 +1,9 @@
 /*
  * "$Id: encode.c 7696 2008-06-26 00:54:42Z mike $"
  *
- *   Option encoding routines for the Common UNIX Printing System (CUPS).
+ *   Option encoding routines for CUPS.
  *
- *   Copyright 2007-2009 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -27,12 +27,7 @@
  * Include necessary headers...
  */
 
-#include "cups.h"
-#include "ipp-private.h"
-#include <stdlib.h>
-#include <ctype.h>
-#include "string.h"
-#include "debug.h"
+#include "cups-private.h"
 
 
 /*
diff --git a/cups/file-private.h b/cups/file-private.h
index 978428d39..0cfd9a549 100644
--- a/cups/file-private.h
+++ b/cups/file-private.h
@@ -1,14 +1,14 @@
 /*
  * "$Id$"
  *
- *   Private file definitions for the Common UNIX Printing System (CUPS).
+ *   Private file definitions for CUPS.
  *
  *   Since stdio files max out at 256 files on many systems, we have to
  *   write similar functions without this limit.  At the same time, using
  *   our own file functions allows us to provide transparent support of
  *   gzip'd print files, PPD files, etc.
  *
- *   Copyright 2007-2009 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -25,14 +25,11 @@
  * Include necessary headers...
  */
 
+#  include "cups-private.h"
 #  include <stdio.h>
 #  include <stdlib.h>
 #  include <stdarg.h>
-#  include <errno.h>
 #  include <fcntl.h>
-#  include "http-private.h"
-#  include "globals.h"
-#  include "debug.h"
 
 #  ifdef HAVE_LIBZ
 #    include <zlib.h>
diff --git a/cups/file.c b/cups/file.c
index 08445bea4..0259716db 100644
--- a/cups/file.c
+++ b/cups/file.c
@@ -1,14 +1,14 @@
 /*
  * "$Id: file.c 7672 2008-06-18 22:03:02Z mike $"
  *
- *   File functions for the Common UNIX Printing System (CUPS).
+ *   File functions for CUPS.
  *
  *   Since stdio files max out at 256 files on many systems, we have to
  *   write similar functions without this limit.  At the same time, using
  *   our own file functions allows us to provide transparent support of
  *   gzip'd print files, PPD files, etc.
  *
- *   Copyright 2007-2009 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
diff --git a/cups/getdevices.c b/cups/getdevices.c
index 76122cead..23d2af36f 100644
--- a/cups/getdevices.c
+++ b/cups/getdevices.c
@@ -1,7 +1,7 @@
 /*
  * "$Id$"
  *
- *   cupsGetDevices implementation for the Common UNIX Printing System (CUPS).
+ *   cupsGetDevices implementation for CUPS.
  *
  *   Copyright 2008-2010 by Apple Inc.
  *
@@ -22,8 +22,7 @@
  * Include necessary headers...
  */
 
-#include "globals.h"
-#include "debug.h"
+#include "cups-private.h"
 
 
 /*
diff --git a/cups/getifaddrs.c b/cups/getifaddrs.c
index d5b602988..6c9cc5547 100644
--- a/cups/getifaddrs.c
+++ b/cups/getifaddrs.c
@@ -1,10 +1,9 @@
 /*
  * "$Id: getifaddrs.c 6649 2007-07-11 21:46:42Z mike $"
  *
- *   Network interface functions for the Common UNIX Printing System
- *   (CUPS) scheduler.
+ *   Network interface functions for CUPS.
  *
- *   Copyright 2007 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
diff --git a/cups/getputfile.c b/cups/getputfile.c
index a8be5aca0..5104abdd8 100644
--- a/cups/getputfile.c
+++ b/cups/getputfile.c
@@ -1,9 +1,9 @@
 /*
  * "$Id: getputfile.c 7359 2008-02-29 19:01:35Z mike $"
  *
- *   Get/put file functions for the Common UNIX Printing System (CUPS).
+ *   Get/put file functions for CUPS.
  *
- *   Copyright 2007-2009 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -26,13 +26,7 @@
  * Include necessary headers...
  */
 
-#include "globals.h"
-#include "cups.h"
-#include "language.h"
-#include "debug.h"
-#include <stdlib.h>
-#include <ctype.h>
-#include <errno.h>
+#include "cups-private.h"
 #include <fcntl.h>
 #include <sys/stat.h>
 #if defined(WIN32) || defined(__EMX__)
diff --git a/cups/globals.c b/cups/globals.c
index 8207312ce..3353604d3 100644
--- a/cups/globals.c
+++ b/cups/globals.c
@@ -1,9 +1,9 @@
 /*
  * "$Id: globals.c 7870 2008-08-27 18:14:10Z mike $"
  *
- *   Global variable access routines for the Common UNIX Printing System (CUPS).
+ *   Global variable access routines for CUPS.
  *
- *   Copyright 2007-2009 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -26,9 +26,7 @@
  * Include necessary headers...
  */
 
-#include "http-private.h"
-#include "globals.h"
-#include <stdlib.h>
+#include "cups-private.h"
 
 
 /*
diff --git a/cups/http-addr.c b/cups/http-addr.c
index 31c8bca89..7f3897c65 100644
--- a/cups/http-addr.c
+++ b/cups/http-addr.c
@@ -1,9 +1,9 @@
 /*
  * "$Id: http-addr.c 7910 2008-09-06 00:25:17Z mike $"
  *
- *   HTTP address routines for the Common UNIX Printing System (CUPS).
+ *   HTTP address routines for CUPS.
  *
- *   Copyright 2007-2009 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -29,11 +29,7 @@
  * Include necessary headers...
  */
 
-#include "http-private.h"
-#include "globals.h"
-#include "debug.h"
-#include <stdlib.h>
-#include <stddef.h>
+#include "cups-private.h"
 #ifdef HAVE_RESOLV_H
 #  include <resolv.h>
 #endif /* HAVE_RESOLV_H */
diff --git a/cups/http-addrlist.c b/cups/http-addrlist.c
index e8f7c84dc..ddf8079b4 100644
--- a/cups/http-addrlist.c
+++ b/cups/http-addrlist.c
@@ -1,9 +1,9 @@
 /*
  * "$Id: http-addrlist.c 7910 2008-09-06 00:25:17Z mike $"
  *
- *   HTTP address list routines for the Common UNIX Printing System (CUPS).
+ *   HTTP address list routines for CUPS.
  *
- *   Copyright 2007-2009 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -23,11 +23,7 @@
  * Include necessary headers...
  */
 
-#include "http-private.h"
-#include "globals.h"
-#include "debug.h"
-#include <stdlib.h>
-#include <errno.h>
+#include "cups-private.h"
 #ifdef HAVE_RESOLV_H
 #  include <resolv.h>
 #endif /* HAVE_RESOLV_H */
diff --git a/cups/http-private.h b/cups/http-private.h
index 9362e36d7..c0e4814cf 100644
--- a/cups/http-private.h
+++ b/cups/http-private.h
@@ -1,9 +1,9 @@
 /*
  * "$Id: http-private.h 7850 2008-08-20 00:07:25Z mike $"
  *
- *   Private HTTP definitions for the Common UNIX Printing System (CUPS).
+ *   Private HTTP definitions for CUPS.
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -22,8 +22,8 @@
  * Include necessary headers...
  */
 
+#  include "config.h"
 #  include <stdlib.h>
-#  include <config.h>
 
 #  ifdef __sun
 #    include <sys/select.h>
@@ -74,8 +74,8 @@
 typedef int socklen_t;
 #  endif /* __sgi || (__APPLE__ && !_SOCKLEN_T) */
 
-#  include "http.h"
-#  include "md5.h"
+#  include <cups/http.h>
+#  include "md5-private.h"
 #  include "ipp-private.h"
 
 #  if defined HAVE_LIBSSL
diff --git a/cups/http-support.c b/cups/http-support.c
index 6ed3fd328..8d9be10e0 100644
--- a/cups/http-support.c
+++ b/cups/http-support.c
@@ -1,9 +1,9 @@
 /*
  * "$Id: http-support.c 7952 2008-09-17 00:56:20Z mike $"
  *
- *   HTTP support routines for the Common UNIX Printing System (CUPS) scheduler.
+ *   HTTP support routines for CUPS.
  *
- *   Copyright 2007-2009 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -47,10 +47,7 @@
  * Include necessary headers...
  */
 
-#include "debug.h"
-#include "globals.h"
-#include <stdlib.h>
-#include <errno.h>
+#include "cups-private.h"
 #ifdef HAVE_DNSSD
 #  include <dns_sd.h>
 #  include <poll.h>
diff --git a/cups/http.c b/cups/http.c
index 084e88e9b..3951b1fee 100644
--- a/cups/http.c
+++ b/cups/http.c
@@ -1,9 +1,9 @@
 /*
  * "$Id: http.c 7850 2008-08-20 00:07:25Z mike $"
  *
- *   HTTP routines for the Common UNIX Printing System (CUPS).
+ *   HTTP routines for CUPS.
  *
- *   Copyright 2007-2009 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   This file contains Kerberos support code, copyright 2006 by
@@ -96,12 +96,8 @@
  * Include necessary headers...
  */
 
-#include "http-private.h"
-#include "globals.h"
-#include "debug.h"
-#include <stdlib.h>
+#include "cups-private.h"
 #include <fcntl.h>
-#include <errno.h>
 #ifndef WIN32
 #  include <signal.h>
 #  include <sys/time.h>
diff --git a/cups/ipp-private.h b/cups/ipp-private.h
index 146b51eef..c4945fc7a 100644
--- a/cups/ipp-private.h
+++ b/cups/ipp-private.h
@@ -1,9 +1,9 @@
 /*
  * "$Id: ipp-private.h 7259 2008-01-28 22:26:04Z mike $"
  *
- *   Private IPP definitions for the Common UNIX Printing System (CUPS).
+ *   Private IPP definitions for CUPS.
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -22,7 +22,7 @@
  * Include necessary headers...
  */
 
-#  include "ipp.h"
+#  include <cups/ipp.h>
 
 
 /*
diff --git a/cups/ipp-support.c b/cups/ipp-support.c
index 4c3eb1467..8e2ee8de2 100644
--- a/cups/ipp-support.c
+++ b/cups/ipp-support.c
@@ -1,10 +1,9 @@
 /*
  * "$Id: ipp-support.c 7847 2008-08-19 04:22:14Z mike $"
  *
- *   Internet Printing Protocol support functions for the Common UNIX
- *   Printing System (CUPS).
+ *   Internet Printing Protocol support functions for CUPS.
  *
- *   Copyright 2007-2009 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -31,9 +30,7 @@
  * Include necessary headers...
  */
 
-#include "globals.h"
-#include "debug.h"
-#include <stdlib.h>
+#include "cups-private.h"
 
 
 /*
diff --git a/cups/ipp.c b/cups/ipp.c
index 2a516c190..cd4014336 100644
--- a/cups/ipp.c
+++ b/cups/ipp.c
@@ -60,11 +60,7 @@
  * Include necessary headers...
  */
 
-#include "http-private.h"
-#include "globals.h"
-#include "debug.h"
-#include <stdlib.h>
-#include <errno.h>
+#include "cups-private.h"
 #ifdef WIN32
 #  include <io.h>
 #endif /* WIN32 */
diff --git a/cups/langprintf.c b/cups/langprintf.c
index d8816df0a..c1ab16e45 100644
--- a/cups/langprintf.c
+++ b/cups/langprintf.c
@@ -1,10 +1,9 @@
 /*
  * "$Id: langprintf.c 7802 2008-07-28 18:50:45Z mike $"
  *
- *   Localized printf/puts functions for the Common UNIX Printing
- *   System (CUPS).
+ *   Localized printf/puts functions for CUPS.
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 2002-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -28,9 +27,7 @@
  * Include necessary headers...
  */
 
-#include <stdio.h>
-#include "globals.h"
-#include <errno.h>
+#include "cups-private.h"
 
 
 /*
diff --git a/cups/i18n.h b/cups/language-private.h
index bc6e779b0..1defb8c22 100644
--- a/cups/i18n.h
+++ b/cups/language-private.h
@@ -1,9 +1,9 @@
 /*
- * "$Id: i18n.h 7363 2008-03-03 22:19:24Z mike $"
+ * "$Id$"
  *
- *   (Private) localization support for the Common UNIX Printing System (CUPS).
+ *   Private localization support for CUPS.
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -15,15 +15,15 @@
  *   This file is subject to the Apple OS-Developed Software exception.
  */
 
-#ifndef _CUPS_I18N_H_
-#  define _CUPS_I18N_H_
+#ifndef _CUPS_LANGUAGE_PRIVATE_H_
+#  define _CUPS_LANGUAGE_PRIVATE_H_
 
 /*
  * Include necessary headers...
  */
 
 #  include <stdio.h>
-#  include "transcode.h"
+#  include <cups/transcode.h>
 
 #  ifdef __cplusplus
 extern "C" {
@@ -108,8 +108,8 @@ extern void		_cupsSetLocale(char *argv[]);
 }
 #  endif /* __cplusplus */
 
-#endif /* !_CUPS_I18N_H_ */
+#endif /* !_CUPS_LANGUAGE_PRIVATE_H_ */
 
 /*
- * End of "$Id: i18n.h 7363 2008-03-03 22:19:24Z mike $".
+ * End of "$Id$".
  */
diff --git a/cups/language.c b/cups/language.c
index b10feedd3..6f3f3ac1c 100644
--- a/cups/language.c
+++ b/cups/language.c
@@ -1,9 +1,9 @@
 /*
  * "$Id: language.c 7558 2008-05-12 23:46:44Z mike $"
  *
- *   I18N/language support for the Common UNIX Printing System (CUPS).
+ *   I18N/language support for CUPS.
  *
- *   Copyright 2007-2009 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -40,10 +40,7 @@
  * Include necessary headers...
  */
 
-#include "globals.h"
-#include "debug.h"
-#include <stdlib.h>
-#include <errno.h>
+#include "cups-private.h"
 #ifdef HAVE_LANGINFO_H
 #  include <langinfo.h>
 #endif /* HAVE_LANGINFO_H */
diff --git a/cups/localize.c b/cups/localize.c
index 4913e6328..cd165a10c 100644
--- a/cups/localize.c
+++ b/cups/localize.c
@@ -1,7 +1,7 @@
 /*
  * "$Id: localize.c 7679 2008-06-19 23:37:45Z mike $"
  *
- *   PPD localization routines for the Common UNIX Printing System (CUPS).
+ *   PPD localization routines for CUPS.
  *
  *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
@@ -43,9 +43,8 @@
  * Include necessary headers.
  */
 
-#include "globals.h"
+#include "cups-private.h"
 #include "ppd-private.h"
-#include "debug.h"
 
 
 /*
diff --git a/cups/mark.c b/cups/mark.c
index a9b5124e3..9ef999b7f 100644
--- a/cups/mark.c
+++ b/cups/mark.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: mark.c 8210 2009-01-09 02:30:26Z mike $"
+ * "$Id: mark.c 9042 2010-03-24 00:45:34Z mike $"
  *
  *   Option marking routines for CUPS.
  *
@@ -40,10 +40,7 @@
  * Include necessary headers...
  */
 
-#include "cups.h"
-#include "string.h"
-#include "debug.h"
-#include "pwg-private.h"
+#include "cups-private.h"
 
 
 /*
@@ -1146,106 +1143,5 @@ ppd_mark_option(ppd_file_t *ppd,	/* I - PPD file */
 
 
 /*
- * 'ppd_mark_size()' - Quickly mark a page size without checking for conflicts.
- *
- * This function is also responsible for mapping PWG/ISO/IPP size names to the
- * PPD file...
- */
-
-static void
-ppd_mark_size(ppd_file_t *ppd,		/* I - PPD file */
-              const char *size)		/* I - Size name */
-{
-  int			i;		/* Looping var */
-  _cups_pwg_media_t	*pwgmedia;	/* PWG media information */
-  ppd_size_t		*ppdsize;	/* Current PPD size */
-  double		dw, dl;		/* Difference in width and height */
-  double		width,		/* Width to find */
-			length;		/* Length to find */
-  char			width_str[256],	/* Width in size name */
-			length_str[256],/* Length in size name */
-			units[256],	/* Units in size name */
-			custom[256];	/* Custom size */
-  struct lconv		*loc;		/* Localization data */
-
-
- /*
-  * See if this is a PPD size...
-  */
-
-  if (!strncasecmp(size, "Custom.", 7) || ppdPageSize(ppd, size))
-  {
-    ppd_mark_option(ppd, "PageSize", size);
-    return;
-  }
-
- /*
-  * Nope, try looking up the PWG or legacy (IPP/ISO) size name...
-  */
-
-  if ((pwgmedia = _cupsPWGMediaByName(size)) == NULL)
-    pwgmedia = _cupsPWGMediaByLegacy(size);
-
-  if (pwgmedia)
-  {
-    width  = pwgmedia->width;
-    length = pwgmedia->length;
-  }
-  else if (sscanf(size, "%*[^_]_%*[^_]_%255[0-9.]x%255[0-9.]%s", width_str,
-                  length_str, units) == 3)
-  {
-   /*
-    * Got a "self-describing" name that isn't in our table...
-    */
-
-    loc    = localeconv();
-    width  = _cupsStrScand(width_str, NULL, loc);
-    length = _cupsStrScand(length_str, NULL, loc);
-
-    if (!strcmp(units, "in"))
-    {
-      width  *= 72.0;
-      length *= 72.0;
-    }
-    else if (!strcmp(units, "mm"))
-    {
-      width  *= 25.4 / 72.0;
-      length *= 25.4 / 72.0;
-    }
-    else
-      return;
-  }
-  else
-    return;
-
- /*
-  * Search the PPD file for a matching size...
-  */
-
-  for (i = ppd->num_sizes, ppdsize = ppd->sizes; i > 0; i --, ppdsize ++)
-  {
-    dw = ppdsize->width - width;
-    dl = ppdsize->length - length;
-
-    if (dw > -5.0 && dw < 5.0 && dl > -5.0 && dl < 5.0)
-    {
-      ppd_mark_option(ppd, "PageSize", ppdsize->name);
-      return;
-    }
-  }
-
- /*
-  * No match found; if custom sizes are supported, set a custom size...
-  */
-
-  if (ppd->variable_sizes)
-  {
-    snprintf(custom, sizeof(custom), "Custom.%dx%d", (int)width, (int)length);
-    ppd_mark_option(ppd, "PageSize", custom);
-  }
-}
-
-
-/*
- * End of "$Id: mark.c 8210 2009-01-09 02:30:26Z mike $".
+ * End of "$Id: mark.c 9042 2010-03-24 00:45:34Z mike $".
  */
diff --git a/cups/md5-apple.h b/cups/md5-apple.h
deleted file mode 100644
index 38f4d5b04..000000000
--- a/cups/md5-apple.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * "$Id: md5-apple.h 6649 2007-07-11 21:46:42Z mike $"
- *
- *   MD5 MacOS X compatibility header for the Common UNIX Printing
- *   System (CUPS).
- *
- *   This file just defines aliases to the (private) CUPS MD5 functions.
- *
- *   Copyright 2007 by Apple Inc.
- *   Copyright 1997-2005 by Easy Software Products.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- *   This file is subject to the Apple OS-Developed Software exception.
- */
-
-void md5_init(_cups_md5_state_t *pms)
-     { _cupsMD5Init(pms); }
-void md5_append(_cups_md5_state_t *pms, const unsigned char *data, int nbytes)
-     { _cupsMD5Append(pms, data, nbytes); }
-void md5_finish(_cups_md5_state_t *pms, unsigned char digest[16])
-     { _cupsMD5Finish(pms, digest); }
-
-/*
- * End of "$Id: md5-apple.h 6649 2007-07-11 21:46:42Z mike $".
- */
diff --git a/cups/md5.h b/cups/md5-private.h
index 3b0281c0f..3667cf0b3 100644
--- a/cups/md5.h
+++ b/cups/md5-private.h
@@ -1,32 +1,33 @@
 /*
-  Copyright 2005 by Easy Software Products
-
-  This header file defines private APIs and should not be used in
-  CUPS-based applications.
-
-  Copyright (C) 1999 Aladdin Enterprises.  All rights reserved.
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  L. Peter Deutsch
-  ghost@aladdin.com
-
+ * "$Id$"
+ *
+ *   Private MD5 definitions for CUPS.
+ *
+ *   Copyright 2007-2010 by Apple Inc.
+ *   Copyright 2005 by Easy Software Products
+ *
+ *   Copyright (C) 1999 Aladdin Enterprises.  All rights reserved.
+ *
+ *   This software is provided 'as-is', without any express or implied
+ *   warranty.  In no event will the authors be held liable for any damages
+ *   arising from the use of this software.
+ *
+ *   Permission is granted to anyone to use this software for any purpose,
+ *   including commercial applications, and to alter it and redistribute it
+ *   freely, subject to the following restrictions:
+ *
+ *   1. The origin of this software must not be misrepresented; you must not
+ *      claim that you wrote the original software. If you use this software
+ *      in a product, an acknowledgment in the product documentation would be
+ *      appreciated but is not required.
+ *   2. Altered source versions must be plainly marked as such, and must not be
+ *      misrepresented as being the original software.
+ *   3. This notice may not be removed or altered from any source distribution.
+ *
+ *   L. Peter Deutsch
+ *   ghost@aladdin.com
  */
-/*$Id: md5.h 5232 2006-03-05 17:59:19Z mike $ */
+
 /*
   Independent implementation of MD5 (RFC 1321).
 
@@ -45,8 +46,8 @@
   1999-05-03 lpd Original version.
  */
 
-#ifndef _CUPS_MD5_H_
-#  define _CUPS_MD5_H_
+#ifndef _CUPS_MD5_PRIVATE_H_
+#  define _CUPS_MD5_PRIVATE_H_
 
 /* Define the state of the MD5 Algorithm. */
 typedef struct _cups_md5_state_s {
@@ -71,4 +72,8 @@ void _cupsMD5Finish(_cups_md5_state_t *pms, unsigned char digest[16]);
 #  ifdef __cplusplus
 }  /* end extern "C" */
 #  endif /* __cplusplus */
-#endif /* !_CUPS_MD5_H_ */
+#endif /* !_CUPS_MD5_PRIVATE_H_ */
+
+/*
+ * End of "$Id$".
+ */
diff --git a/cups/md5.c b/cups/md5.c
index 9a3fab987..f7c42ad24 100644
--- a/cups/md5.c
+++ b/cups/md5.c
@@ -1,32 +1,32 @@
 /*
-  Copyright 2005 by Easy Software Products
-
-  This source file implements private APIs and should not be used in
-  CUPS-based applications.
-
-  Copyright (C) 1999 Aladdin Enterprises.  All rights reserved.
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  L. Peter Deutsch
-  ghost@aladdin.com
-
+ * "$Id: md5.c 9042 2010-03-24 00:45:34Z mike $"
+ *
+ *   Private MD5 implementation for CUPS.
+ *
+ *   Copyright 2007-2010 by Apple Inc.
+ *   Copyright 2005 by Easy Software Products
+ *
+ *   Copyright (C) 1999 Aladdin Enterprises.  All rights reserved.
+ *
+ *   This software is provided 'as-is', without any express or implied
+ *   warranty.  In no event will the authors be held liable for any damages
+ *   arising from the use of this software.
+ *
+ *   Permission is granted to anyone to use this software for any purpose,
+ *   including commercial applications, and to alter it and redistribute it
+ *   freely, subject to the following restrictions:
+ *
+ *   1. The origin of this software must not be misrepresented; you must not
+ *      claim that you wrote the original software. If you use this software
+ *      in a product, an acknowledgment in the product documentation would be
+ *      appreciated but is not required.
+ *   2. Altered source versions must be plainly marked as such, and must not be
+ *      misrepresented as being the original software.
+ *   3. This notice may not be removed or altered from any source distribution.
+ *
+ *   L. Peter Deutsch
+ *   ghost@aladdin.com
  */
-/*$Id: md5.c 5232 2006-03-05 17:59:19Z mike $ */
 /*
   Independent implementation of MD5 (RFC 1321).
 
@@ -43,11 +43,8 @@
   1999-05-03 lpd Original version.
  */
 
-#include "md5.h"
-#include "string.h"
-#ifdef __APPLE__
-#  include "md5-apple.h"
-#endif /* __APPLE__ */
+#include "md5-private.h"
+#include "string-private.h"
 
 #define T1 0xd76aa478
 #define T2 0xe8c7b756
@@ -342,3 +339,8 @@ _cupsMD5Finish(_cups_md5_state_t *pms, unsigned char digest[16])
     for (i = 0; i < 16; ++i)
 	digest[i] = (unsigned char)(pms->abcd[i >> 2] >> ((i & 3) << 3));
 }
+
+
+/*
+ * End of "$Id: md5.c 9042 2010-03-24 00:45:34Z mike $".
+ */
diff --git a/cups/md5passwd.c b/cups/md5passwd.c
index 2dd3c122c..777073a00 100644
--- a/cups/md5passwd.c
+++ b/cups/md5passwd.c
@@ -1,9 +1,9 @@
 /*
  * "$Id: md5passwd.c 6649 2007-07-11 21:46:42Z mike $"
  *
- *   MD5 password support for the Common UNIX Printing System (CUPS).
+ *   MD5 password support for CUPS.
  *
- *   Copyright 2007 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 1997-2005 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -27,7 +27,7 @@
  */
 
 #include "http-private.h"
-#include "string.h"
+#include "string-private.h"
 
 
 /*
diff --git a/cups/notify.c b/cups/notify.c
index 3cb07a5af..b514c7db3 100644
--- a/cups/notify.c
+++ b/cups/notify.c
@@ -1,9 +1,9 @@
 /*
  * "$Id: notify.c 7337 2008-02-22 04:44:04Z mike $"
  *
- *   Notification routines for the Common UNIX Printing System (CUPS).
+ *   Notification routines for CUPS.
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 2005-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -25,7 +25,7 @@
  * Include necessary headers...
  */
 
-#include "globals.h"
+#include "cups-private.h"
 
 
 /*
diff --git a/cups/options.c b/cups/options.c
index 0c9069c09..db82637ea 100644
--- a/cups/options.c
+++ b/cups/options.c
@@ -31,10 +31,8 @@
  */
 
 #include "cups.h"
-#include <stdlib.h>
-#include <ctype.h>
-#include "string.h"
-#include "debug.h"
+#include "string-private.h"
+#include "debug-private.h"
 
 
 /*
diff --git a/cups/page.c b/cups/page.c
index bf4fd862c..d240a407e 100644
--- a/cups/page.c
+++ b/cups/page.c
@@ -1,7 +1,7 @@
 /*
  * "$Id: page.c 7791 2008-07-24 00:55:30Z mike $"
  *
- *   Page size functions for the Common UNIX Printing System (CUPS).
+ *   Page size functions for CUPS.
  *
  *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
@@ -28,10 +28,9 @@
  * Include necessary headers...
  */
 
+#include "string-private.h"
+#include "debug-private.h"
 #include "ppd.h"
-#include "string.h"
-#include <ctype.h>
-#include "debug.h"
 
 
 /*
diff --git a/cups/ppd-private.h b/cups/ppd-private.h
index 7b647b511..996693105 100644
--- a/cups/ppd-private.h
+++ b/cups/ppd-private.h
@@ -31,7 +31,7 @@
  * Include necessary headers...
  */
 
-#  include "cups.h"
+#  include <cups/cups.h>
 
 
 /*
diff --git a/cups/ppd.c b/cups/ppd.c
index dbdaaf17a..f360134e0 100644
--- a/cups/ppd.c
+++ b/cups/ppd.c
@@ -59,11 +59,8 @@
  * Include necessary headers.
  */
 
+#include "cups-private.h"
 #include "ppd-private.h"
-#include "pwg-private.h"
-#include "globals.h"
-#include "debug.h"
-#include <stdlib.h>
 
 
 /*
diff --git a/cups/pwg-file.c b/cups/pwg-file.c
index 454edb0d4..b81339289 100644
--- a/cups/pwg-file.c
+++ b/cups/pwg-file.c
@@ -24,10 +24,7 @@
  * Include necessary headers...
  */
 
-#include "pwg-private.h"
-#include "globals.h"
-#include "string.h"
-#include "debug.h"
+#include "cups-private.h"
 #include <math.h>
 
 
diff --git a/cups/pwg-media.c b/cups/pwg-media.c
index fbd97f722..a41c4cbf1 100644
--- a/cups/pwg-media.c
+++ b/cups/pwg-media.c
@@ -32,10 +32,7 @@
  * Include necessary headers...
  */
 
-#include "pwg-private.h"
-#include "globals.h"
-#include "string.h"
-#include "debug.h"
+#include "cups-private.h"
 #include <math.h>
 
 
diff --git a/cups/pwg-ppd.c b/cups/pwg-ppd.c
index 319e7c3cd..a0fc0837c 100644
--- a/cups/pwg-ppd.c
+++ b/cups/pwg-ppd.c
@@ -39,10 +39,7 @@
  * Include necessary headers...
  */
 
-#include "pwg-private.h"
-#include "globals.h"
-#include "string.h"
-#include "debug.h"
+#include "cups-private.h"
 #include <math.h>
 
 
diff --git a/cups/pwg-private.h b/cups/pwg-private.h
index 05ab28e53..4bf074e84 100644
--- a/cups/pwg-private.h
+++ b/cups/pwg-private.h
@@ -1,7 +1,7 @@
 /*
  * "$Id$"
  *
- *   PWG media API definitions for CUPS.
+ *   Private PWG media API definitions for CUPS.
  *
  *   Copyright 2009-2010 by Apple Inc.
  *
diff --git a/cups/request.c b/cups/request.c
index 413191bb0..60d80e5a6 100644
--- a/cups/request.c
+++ b/cups/request.c
@@ -1,7 +1,7 @@
 /*
  * "$Id: request.c 7946 2008-09-16 23:27:54Z mike $"
  *
- *   IPP utilities for the Common UNIX Printing System (CUPS).
+ *   IPP utilities for CUPS.
  *
  *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
@@ -31,10 +31,7 @@
  * Include necessary headers...
  */
 
-#include "globals.h"
-#include "debug.h"
-#include <stdlib.h>
-#include <errno.h>
+#include "cups-private.h"
 #include <fcntl.h>
 #include <sys/stat.h>
 #if defined(WIN32) || defined(__EMX__)
diff --git a/cups/sidechannel.c b/cups/sidechannel.c
index 0ed4a744a..17abb2b3f 100644
--- a/cups/sidechannel.c
+++ b/cups/sidechannel.c
@@ -1,9 +1,9 @@
 /*
  * "$Id: sidechannel.c 7720 2008-07-11 22:46:21Z mike $"
  *
- *   Side-channel API code for the Common UNIX Printing System (CUPS).
+ *   Side-channel API code for CUPS.
  *
- *   Copyright 2007-2009 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -29,14 +29,13 @@
  */
 
 #include "sidechannel.h"
-#include "string.h"
-#include "debug.h"
+#include "string-private.h"
+#include "debug-private.h"
 #ifdef WIN32
 #  include <io.h>
 #else
 #  include <unistd.h>
 #endif /* WIN32 */
-#include <errno.h>
 #ifdef __hpux
 #  include <sys/time.h>
 #elif !defined(WIN32)
diff --git a/cups/snmp-private.h b/cups/snmp-private.h
index 1745b9259..2c6d95371 100644
--- a/cups/snmp-private.h
+++ b/cups/snmp-private.h
@@ -1,12 +1,9 @@
 /*
  * "$Id$"
  *
- *   SNMP definitions for the Common UNIX Printing System (CUPS).
+ *   Private SNMP definitions for CUPS.
  *
- *   This API is PRIVATE and subject to change.  No third-party applications
- *   should use the SNMP API defined in this file.
- *
- *   Copyright 2007-2009 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 2006-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -18,15 +15,15 @@
  *   This file is subject to the Apple OS-Developed Software exception.
  */
 
-#ifndef _CUPS_SNMP_H_
-#  define _CUPS_SNMP_H_
+#ifndef _CUPS_SNMP_PRIVATE_H_
+#  define _CUPS_SNMP_PRIVATE_H_
 
 
 /*
  * Include necessary headers.
  */
 
-#include "http.h"
+#include <cups/http.h>
 
 
 /*
@@ -140,7 +137,7 @@ extern int		_cupsSNMPWrite(int fd, http_addr_t *address, int version,
 #  ifdef __cplusplus
 }
 #  endif /* __cplusplus */
-#endif /* !_CUPS_SNMP_H_ */
+#endif /* !_CUPS_SNMP_PRIVATE_H_ */
 
 
 /*
diff --git a/cups/snmp.c b/cups/snmp.c
index 7079878a6..a2aeafbba 100644
--- a/cups/snmp.c
+++ b/cups/snmp.c
@@ -1,7 +1,7 @@
 /*
  * "$Id$"
  *
- *   SNMP functions for the Common UNIX Printing System (CUPS).
+ *   SNMP functions for CUPS.
  *
  *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 2006-2007 by Easy Software Products, all rights reserved.
@@ -58,10 +58,8 @@
  * Include necessary headers.
  */
 
-#include "globals.h"
-#include "debug.h"
+#include "cups-private.h"
 #include "snmp-private.h"
-#include <errno.h>
 #ifdef HAVE_POLL
 #  include <sys/poll.h>
 #endif /* HAVE_POLL */
diff --git a/cups/snprintf.c b/cups/snprintf.c
index 018a3f7ae..fcebf895e 100644
--- a/cups/snprintf.c
+++ b/cups/snprintf.c
@@ -1,9 +1,9 @@
 /*
  * "$Id: snprintf.c 6649 2007-07-11 21:46:42Z mike $"
  *
- *   snprintf functions for the Common UNIX Printing System (CUPS).
+ *   snprintf functions for CUPS.
  *
- *   Copyright 2007 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -24,9 +24,7 @@
  * Include necessary headers...
  */
 
-#include <stdio.h>
-#include <ctype.h>
-#include "string.h"
+#include "string-private.h"
 
 
 #ifndef HAVE_VSNPRINTF
diff --git a/cups/string.h b/cups/string-private.h
index d8bd8e3e2..d542d89af 100644
--- a/cups/string.h
+++ b/cups/string-private.h
@@ -1,9 +1,9 @@
 /*
- * "$Id: string.h 6649 2007-07-11 21:46:42Z mike $"
+ * "$Id$"
  *
- *   String definitions for the Common UNIX Printing System (CUPS).
+ *   Private string definitions for CUPS.
  *
- *   Copyright 2007-2009 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -15,8 +15,8 @@
  *   This file is subject to the Apple OS-Developed Software exception.
  */
 
-#ifndef _CUPS_STRING_H_
-#  define _CUPS_STRING_H_
+#ifndef _CUPS_STRING_PRIVATE_H_
+#  define _CUPS_STRING_PRIVATE_H_
 
 /*
  * Include necessary headers...
@@ -26,9 +26,10 @@
 #  include <stdlib.h>
 #  include <stdarg.h>
 #  include <ctype.h>
+#  include <errno.h>
 #  include <locale.h>
 
-#  include <config.h>
+#  include "config.h"
 
 #  ifdef HAVE_STRING_H
 #    include <string.h>
@@ -155,5 +156,5 @@ extern double	_cupsStrScand(const char *buf, char **bufptr,
 #endif /* !_CUPS_STRING_H_ */
 
 /*
- * End of "$Id: string.h 6649 2007-07-11 21:46:42Z mike $".
+ * End of "$Id$".
  */
diff --git a/cups/string.c b/cups/string.c
index 2d93eb8f3..9e60076a2 100644
--- a/cups/string.c
+++ b/cups/string.c
@@ -1,9 +1,9 @@
 /*
  * "$Id: string.c 7460 2008-04-16 02:19:54Z mike $"
  *
- *   String functions for the Common UNIX Printing System (CUPS).
+ *   String functions for CUPS.
  *
- *   Copyright 2007-2009 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -36,12 +36,12 @@
  * Include necessary headers...
  */
 
+#include "string-private.h"
+#include "debug-private.h"
+#include "array.h"
 #include <stdlib.h>
 #include <stddef.h>
 #include <limits.h>
-#include "array.h"
-#include "debug.h"
-#include "string.h"
 #ifdef HAVE_PTHREAD_H
 #  include <pthread.h>
 #endif /* HAVE_PTHREAD_H */
diff --git a/cups/tempfile.c b/cups/tempfile.c
index 1503b4f7d..facd5242a 100644
--- a/cups/tempfile.c
+++ b/cups/tempfile.c
@@ -1,9 +1,9 @@
 /*
  * "$Id: tempfile.c 7337 2008-02-22 04:44:04Z mike $"
  *
- *   Temp file utilities for the Common UNIX Printing System (CUPS).
+ *   Temp file utilities for CUPS.
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -25,10 +25,8 @@
  * Include necessary headers...
  */
 
-#include "globals.h"
-#include "debug.h"
+#include "cups-private.h"
 #include <stdlib.h>
-#include <errno.h>
 #include <fcntl.h>
 #include <sys/stat.h>
 #if defined(WIN32) || defined(__EMX__)
diff --git a/cups/testadmin.c b/cups/testadmin.c
index 09aaa324c..a16025c3e 100644
--- a/cups/testadmin.c
+++ b/cups/testadmin.c
@@ -1,9 +1,9 @@
 /*
  * "$Id: testadmin.c 7720 2008-07-11 22:46:21Z mike $"
  *
- *   Admin function test program for the Common UNIX Printing System (CUPS).
+ *   Admin function test program for CUPS.
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -25,7 +25,7 @@
  */
 
 #include "adminutil.h"
-#include "string.h"
+#include "string-private.h"
 
 
 /*
diff --git a/cups/testarray.c b/cups/testarray.c
index 52aedff50..a34d1f4e4 100644
--- a/cups/testarray.c
+++ b/cups/testarray.c
@@ -1,9 +1,9 @@
 /*
  * "$Id: testarray.c 6649 2007-07-11 21:46:42Z mike $"
  *
- *   Array test program for the Common UNIX Printing System (CUPS).
+ *   Array test program for CUPS.
  *
- *   Copyright 2007-2009 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -25,13 +25,12 @@
  * Include necessary headers...
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <cups/string.h>
-#include <errno.h>
+#include "string-private.h"
+#include "debug-private.h"
 #include "array.h"
 #include "dir.h"
-#include "debug.h"
+#include <stdio.h>
+#include <stdlib.h>
 
 
 /*
diff --git a/cups/testconflicts.c b/cups/testconflicts.c
index 0d7531bdb..831582128 100644
--- a/cups/testconflicts.c
+++ b/cups/testconflicts.c
@@ -1,9 +1,9 @@
 /*
  * "$Id$"
  *
- *   PPD constraint test program for the Common UNIX Printing System (CUPS).
+ *   PPD constraint test program for CUPS.
  *
- *   Copyright 2008-2009 by Apple Inc.
+ *   Copyright 2008-2010 by Apple Inc.
  *
  *   These coded instructions, statements, and computer programs are the
  *   property of Apple Inc. and are protected by Federal copyright
@@ -23,7 +23,7 @@
  */
 
 #include "cups.h"
-#include "string.h"
+#include "string-private.h"
 
 
 /*
diff --git a/cups/testcups.c b/cups/testcups.c
index 555df69a5..22ee86607 100644
--- a/cups/testcups.c
+++ b/cups/testcups.c
@@ -1,9 +1,9 @@
 /*
  * "$Id$"
  *
- *   CUPS API test program for the Common UNIX Printing System (CUPS).
+ *   CUPS API test program for CUPS.
  *
- *   Copyright 2007-2009 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -24,11 +24,9 @@
  * Include necessary headers...
  */
 
-#include <stdio.h>
-#include <stdlib.h>
+#include "string-private.h"
 #include "cups.h"
-#include "string.h"
-#include <errno.h>
+#include <stdlib.h>
 
 
 /*
diff --git a/cups/testfile.c b/cups/testfile.c
index c36434482..1363dfacf 100644
--- a/cups/testfile.c
+++ b/cups/testfile.c
@@ -1,9 +1,9 @@
 /*
  * "$Id: testfile.c 7720 2008-07-11 22:46:21Z mike $"
  *
- *   File test program for the Common UNIX Printing System (CUPS).
+ *   File test program for CUPS.
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -26,13 +26,11 @@
  * Include necessary headers...
  */
 
-#include <stdio.h>
+#include "string-private.h"
+#include "debug-private.h"
+#include "file.h"
 #include <stdlib.h>
-#include <errno.h>
 #include <time.h>
-#include "string.h"
-#include "file.h"
-#include "debug.h"
 #ifdef HAVE_LIBZ
 #  include <zlib.h>
 #endif /* HAVE_LIBZ */
diff --git a/cups/testhttp.c b/cups/testhttp.c
index 41d9ce6f1..4763c2ba9 100644
--- a/cups/testhttp.c
+++ b/cups/testhttp.c
@@ -1,9 +1,9 @@
 /*
  * "$Id: testhttp.c 7742 2008-07-15 20:23:09Z mike $"
  *
- *   HTTP test program for the Common UNIX Printing System (CUPS).
+ *   HTTP test program for CUPS.
  *
- *   Copyright 2007-2009 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -23,10 +23,9 @@
  * Include necessary headers...
  */
 
-#include <stdio.h>
-#include <stdlib.h>
+#include "string-private.h"
 #include "http-private.h"
-#include "string.h"
+#include <stdlib.h>
 
 
 /*
diff --git a/cups/testi18n.c b/cups/testi18n.c
index 139dd2ff5..76a06cc33 100644
--- a/cups/testi18n.c
+++ b/cups/testi18n.c
@@ -1,9 +1,9 @@
 /*
  * "$Id: testi18n.c 7560 2008-05-13 06:34:04Z mike $"
  *
- *   Internationalization test for Common UNIX Printing System (CUPS).
+ *   Internationalization test for CUPS.
  *
- *   Copyright 2007-2009 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -24,15 +24,12 @@
  * Include necessary headers...
  */
 
-#include <stdio.h>
+#include "string-private.h"
+#include "language-private.h"
 #include <stdlib.h>
-#include <errno.h>
 #include <time.h>
 #include <unistd.h>
 
-#include "i18n.h"
-#include "string.h"
-
 
 /*
  * Local globals...
diff --git a/cups/testipp.c b/cups/testipp.c
index d6247621d..5e9b657c2 100644
--- a/cups/testipp.c
+++ b/cups/testipp.c
@@ -1,7 +1,7 @@
 /*
  * "$Id: testipp.c 6649 2007-07-11 21:46:42Z mike $"
  *
- *   IPP test program for the Common UNIX Printing System (CUPS).
+ *   IPP test program for CUPS.
  *
  *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 1997-2005 by Easy Software Products.
@@ -23,11 +23,9 @@
  * Include necessary headers...
  */
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <cups/file.h>
-#include <cups/string.h>
-#include <errno.h>
+#include "string-private.h"
 #include "ipp-private.h"
 #ifdef WIN32
 #  include <io.h>
diff --git a/cups/testlang.c b/cups/testlang.c
index fde1bb39c..2cec8b6b8 100644
--- a/cups/testlang.c
+++ b/cups/testlang.c
@@ -1,9 +1,9 @@
 /*
  * "$Id: testlang.c 6649 2007-07-11 21:46:42Z mike $"
  *
- *   Localization test program for the Common UNIX Printing System (CUPS).
+ *   Localization test program for CUPS.
  *
- *   Copyright 2007-2009 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -23,9 +23,7 @@
  * Include necessary headers...
  */
 
-#include <stdio.h>
-#include "i18n.h"
-#include "string.h"
+#include "cups-private.h"
 
 
 /*
diff --git a/cups/testoptions.c b/cups/testoptions.c
index 39aa0089f..1cd72794f 100644
--- a/cups/testoptions.c
+++ b/cups/testoptions.c
@@ -1,9 +1,9 @@
 /*
  * "$Id$"
  *
- *   Option test program for the Common UNIX Printing System (CUPS).
+ *   Option test program for CUPS.
  *
- *   Copyright 2008 by Apple Inc.
+ *   Copyright 2008-2010 by Apple Inc.
  *
  *   These coded instructions, statements, and computer programs are the
  *   property of Apple Inc. and are protected by Federal copyright
@@ -22,8 +22,7 @@
  * Include necessary headers...
  */
 
-#include "string.h"
-#include "cups.h"
+#include "cups-private.h"
 
 
 /*
diff --git a/cups/testppd.c b/cups/testppd.c
index c63778a7b..a77490e42 100644
--- a/cups/testppd.c
+++ b/cups/testppd.c
@@ -1,7 +1,7 @@
 /*
  * "$Id: testppd.c 7897 2008-09-02 19:33:19Z mike $"
  *
- *   PPD test program for the Common UNIX Printing System (CUPS).
+ *   PPD test program for CUPS.
  *
  *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
@@ -23,12 +23,9 @@
  * Include necessary headers...
  */
 
-#include <cups/cups.h>
-#include <cups/string.h>
-#include <stdio.h>
+#include "cups-private.h"
 #include <stdlib.h>
 #include <sys/stat.h>
-#include <errno.h>
 #ifdef WIN32
 #  include <io.h>
 #else
diff --git a/cups/testsnmp.c b/cups/testsnmp.c
index 52983a968..b846b9e2c 100644
--- a/cups/testsnmp.c
+++ b/cups/testsnmp.c
@@ -1,9 +1,9 @@
 /*
  * "$Id$"
  *
- *   SNMP test program for the Common UNIX Printing System (CUPS).
+ *   SNMP test program for CUPS.
  *
- *   Copyright 2008-2009 by Apple Inc.
+ *   Copyright 2008-2010 by Apple Inc.
  *
  *   These coded instructions, statements, and computer programs are the
  *   property of Apple Inc. and are protected by Federal copyright
@@ -25,11 +25,9 @@
  * Include necessary headers...
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include "string.h"
+#include "cups-private.h"
 #include "snmp-private.h"
+#include <stdlib.h>
 
 
 /*
diff --git a/cups/transcode.c b/cups/transcode.c
index fed9c9492..2bda3c145 100644
--- a/cups/transcode.c
+++ b/cups/transcode.c
@@ -1,9 +1,9 @@
 /*
  * "$Id: transcode.c 7560 2008-05-13 06:34:04Z mike $"
  *
- *   Transcoding support for the Common UNIX Printing System (CUPS).
+ *   Transcoding support for CUPS.
  *
- *   Copyright 2007-2009 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -40,11 +40,9 @@
  * Include necessary headers...
  */
 
-#include "globals.h"
-#include "debug.h"
+#include "cups-private.h"
 #include <limits.h>
 #include <stdlib.h>
-#include <errno.h>
 #include <time.h>
 
 
diff --git a/cups/usersys.c b/cups/usersys.c
index 60796c313..92bd2ca17 100644
--- a/cups/usersys.c
+++ b/cups/usersys.c
@@ -37,8 +37,7 @@
  * Include necessary headers...
  */
 
-#include "http-private.h"
-#include "globals.h"
+#include "cups-private.h"
 #include <stdlib.h>
 #include <sys/stat.h>
 #ifdef WIN32
@@ -46,7 +45,6 @@
 #else
 #  include <pwd.h>
 #endif /* WIN32 */
-#include "debug.h"
 
 
 /*
diff --git a/cups/util.c b/cups/util.c
index f0670436e..1b9b839d1 100644
--- a/cups/util.c
+++ b/cups/util.c
@@ -1,7 +1,7 @@
 /*
  * "$Id: util.c 7850 2008-08-20 00:07:25Z mike $"
  *
- *   Printing utilities for the Common UNIX Printing System (CUPS).
+ *   Printing utilities for CUPS.
  *
  *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
@@ -58,10 +58,8 @@
  * Include necessary headers...
  */
 
-#include "globals.h"
-#include "debug.h"
+#include "cups-private.h"
 #include <stdlib.h>
-#include <errno.h>
 #include <fcntl.h>
 #include <sys/stat.h>
 #if defined(WIN32) || defined(__EMX__)