#if defined(WIN32) || defined(__EMX__)
diff --git a/doc/help/kerberos.html b/doc/help/kerberos.html
index dbac3f14f..941867fc2 100644
--- a/doc/help/kerberos.html
+++ b/doc/help/kerberos.html
@@ -103,7 +103,7 @@ for more information.
CUPS implements Kerberos over HTTP using GSSAPI and the service name
-"ipp". Because of limitations in the HTTP GSSAPI protocol extension, only
+"host". Because of limitations in the HTTP GSSAPI protocol extension, only
a single domain/KDC is supported for authentication.
When doing printing tasks that require authentication, CUPS requests a
diff --git a/driver/Dependencies b/driver/Dependencies
index ed31ab6c7..17875506a 100644
--- a/driver/Dependencies
+++ b/driver/Dependencies
@@ -3,45 +3,48 @@
commandtoescpx.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h
commandtoescpx.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h
commandtoescpx.o: ../cups/file.h ../cups/language.h driver.h ../cups/raster.h
-commandtoescpx.o: ../cups/string.h ../config.h ../data/escp.h
+commandtoescpx.o: ../cups/string-private.h ../config.h ../data/escp.h
commandtopclx.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h
commandtopclx.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h
commandtopclx.o: ../cups/file.h ../cups/language.h driver.h ../cups/raster.h
-commandtopclx.o: ../cups/string.h ../config.h ../data/pcl.h
+commandtopclx.o: ../cups/string-private.h ../config.h ../data/pcl.h
rastertoescpx.o: driver.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
rastertoescpx.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h
rastertoescpx.o: ../cups/file.h ../cups/language.h ../cups/raster.h
-rastertoescpx.o: ../cups/i18n.h ../cups/transcode.h ../cups/string.h
-rastertoescpx.o: ../config.h ../data/escp.h
+rastertoescpx.o: ../cups/language-private.h ../cups/transcode.h
+rastertoescpx.o: ../cups/string-private.h ../config.h ../data/escp.h
rastertopclx.o: driver.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
rastertopclx.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h
rastertopclx.o: ../cups/file.h ../cups/language.h ../cups/raster.h
-rastertopclx.o: ../cups/i18n.h ../cups/transcode.h ../cups/string.h
-rastertopclx.o: ../config.h pcl-common.h ../data/pcl.h
+rastertopclx.o: ../cups/language-private.h ../cups/transcode.h
+rastertopclx.o: ../cups/string-private.h ../config.h pcl-common.h
+rastertopclx.o: ../data/pcl.h
pcl-common.o: driver.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
pcl-common.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h
pcl-common.o: ../cups/file.h ../cups/language.h ../cups/raster.h pcl-common.h
-pcl-common.o: ../cups/string.h ../config.h ../data/pcl.h
-testcmyk.o: ../cups/string.h ../config.h driver.h ../cups/cups.h
+pcl-common.o: ../cups/string-private.h ../config.h ../data/pcl.h
+testcmyk.o: ../cups/string-private.h ../config.h driver.h ../cups/cups.h
testcmyk.o: ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h
testcmyk.o: ../cups/array.h ../cups/file.h ../cups/language.h
testcmyk.o: ../cups/raster.h
testdither.o: driver.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
testdither.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h
testdither.o: ../cups/file.h ../cups/language.h ../cups/raster.h
-testdither.o: ../cups/string.h ../config.h
-testrgb.o: ../cups/string.h ../config.h driver.h ../cups/cups.h ../cups/ipp.h
-testrgb.o: ../cups/http.h ../cups/versioning.h ../cups/ppd.h ../cups/array.h
-testrgb.o: ../cups/file.h ../cups/language.h ../cups/raster.h
+testdither.o: ../cups/string-private.h ../config.h
+testrgb.o: ../cups/string-private.h ../config.h driver.h ../cups/cups.h
+testrgb.o: ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h
+testrgb.o: ../cups/array.h ../cups/file.h ../cups/language.h ../cups/raster.h
attr.o: driver.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
attr.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-attr.o: ../cups/language.h ../cups/raster.h ../cups/string.h ../config.h
+attr.o: ../cups/language.h ../cups/raster.h ../cups/string-private.h
+attr.o: ../config.h
check.o: driver.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
check.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
check.o: ../cups/language.h ../cups/raster.h
cmyk.o: driver.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
cmyk.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-cmyk.o: ../cups/language.h ../cups/raster.h ../cups/string.h ../config.h
+cmyk.o: ../cups/language.h ../cups/raster.h ../cups/string-private.h
+cmyk.o: ../config.h
dither.o: driver.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
dither.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
dither.o: ../cups/language.h ../cups/raster.h ../config.h
diff --git a/driver/attr.c b/driver/attr.c
index 320e1c7da..4eba32417 100644
--- a/driver/attr.c
+++ b/driver/attr.c
@@ -3,7 +3,7 @@
*
* PPD attribute lookup routine for CUPS.
*
- * Copyright 2007 by Apple Inc.
+ * Copyright 2007-2010 by Apple Inc.
* Copyright 1993-2005 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
@@ -23,7 +23,7 @@
*/
#include "driver.h"
-#include
+#include
/*
diff --git a/driver/cmyk.c b/driver/cmyk.c
index b5ab4ede4..c6c350c24 100644
--- a/driver/cmyk.c
+++ b/driver/cmyk.c
@@ -3,7 +3,7 @@
*
* CMYK color separation code for CUPS.
*
- * Copyright 2007-2008 by Apple Inc.
+ * Copyright 2007-2010 by Apple Inc.
* Copyright 1993-2005 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
@@ -34,7 +34,7 @@
*/
#include "driver.h"
-#include
+#include
/*
diff --git a/driver/commandtoescpx.c b/driver/commandtoescpx.c
index ce09ebcad..1039f4337 100644
--- a/driver/commandtoescpx.c
+++ b/driver/commandtoescpx.c
@@ -3,7 +3,7 @@
*
* Advanced EPSON ESC/P command filter for CUPS.
*
- * Copyright 2007 by Apple Inc.
+ * Copyright 2007-2010 by Apple Inc.
* Copyright 1993-2005 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
@@ -24,7 +24,7 @@
#include
#include "driver.h"
-#include
+#include
#include "data/escp.h"
diff --git a/driver/commandtopclx.c b/driver/commandtopclx.c
index 1c5c10df1..2d51e96fb 100644
--- a/driver/commandtopclx.c
+++ b/driver/commandtopclx.c
@@ -3,7 +3,7 @@
*
* Advanced PCL command filter for CUPS.
*
- * Copyright 2007 by Apple Inc.
+ * Copyright 2007-2010 by Apple Inc.
* Copyright 1993-2005 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
@@ -24,7 +24,7 @@
#include
#include "driver.h"
-#include
+#include
#include "data/pcl.h"
diff --git a/driver/pcl-common.h b/driver/pcl-common.h
index 17819ab01..7cab21cb9 100644
--- a/driver/pcl-common.h
+++ b/driver/pcl-common.h
@@ -3,7 +3,7 @@
*
* Common HP-PCL definitions for CUPS.
*
- * Copyright 2007 by Apple Inc.
+ * Copyright 2007-2010 by Apple Inc.
* Copyright 1993-2005 by Easy Software Products, All Rights Reserved.
*
* These coded instructions, statements, and computer programs are the
@@ -17,7 +17,7 @@
* Include necessary headers...
*/
-#include
+#include
#include "data/pcl.h"
diff --git a/driver/rastertoescpx.c b/driver/rastertoescpx.c
index 6361a40b9..38ef623bc 100644
--- a/driver/rastertoescpx.c
+++ b/driver/rastertoescpx.c
@@ -3,7 +3,7 @@
*
* Advanced EPSON ESC/P raster driver for CUPS.
*
- * Copyright 2007-2009 by Apple Inc.
+ * Copyright 2007-2010 by Apple Inc.
* Copyright 1993-2005 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
@@ -31,11 +31,10 @@
*/
#include "driver.h"
-#include
-#include
+#include
+#include
#include "data/escp.h"
#include
-#include
/*
diff --git a/driver/rastertopclx.c b/driver/rastertopclx.c
index fe303d47e..f522ac6fb 100644
--- a/driver/rastertopclx.c
+++ b/driver/rastertopclx.c
@@ -4,7 +4,7 @@
* Advanced HP Page Control Language and Raster Transfer Language
* filter for CUPS.
*
- * Copyright 2007-2009 by Apple Inc.
+ * Copyright 2007-2010 by Apple Inc.
* Copyright 1993-2005 by Easy Software Products
*
* These coded instructions, statements, and computer programs are the
@@ -30,11 +30,10 @@
*/
#include "driver.h"
-#include
-#include
+#include
+#include
#include "pcl-common.h"
#include
-#include
/*
diff --git a/driver/testcmyk.c b/driver/testcmyk.c
index a89353cd9..97bac6f47 100644
--- a/driver/testcmyk.c
+++ b/driver/testcmyk.c
@@ -1,9 +1,9 @@
/*
* "$Id$"
*
- * Test the CMYK color separation code for ESP Print Pro.
+ * Test the CMYK color separation code for CUPS.
*
- * Copyright 2007 by Apple Inc.
+ * Copyright 2007-2010 by Apple Inc.
* Copyright 1993-2006 by Easy Software Products, All Rights Reserved.
*
* These coded instructions, statements, and computer programs are the
@@ -23,7 +23,7 @@
* Include necessary headers.
*/
-#include
+#include
#include "driver.h"
#include
diff --git a/driver/testdither.c b/driver/testdither.c
index 29f5e337e..547e47d05 100644
--- a/driver/testdither.c
+++ b/driver/testdither.c
@@ -1,7 +1,7 @@
/*
* "$Id$"
*
- * Dither test program for ESP Print Pro.
+ * Dither test program for CUPS.
*
* Try the following:
*
@@ -12,7 +12,7 @@
* testdither 0 210 383 > filename.ppm
* testdither 0 82 255 > filename.ppm
*
- * Copyright 2007 by Apple Inc.
+ * Copyright 2007-2010 by Apple Inc.
* Copyright 1993-2005 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
@@ -32,7 +32,7 @@
*/
#include "driver.h"
-#include
+#include
/*
diff --git a/driver/testdriver.c b/driver/testdriver.c
index f2159c3c1..4263920e0 100644
--- a/driver/testdriver.c
+++ b/driver/testdriver.c
@@ -1,14 +1,13 @@
/*
* "$Id: testdriver.c 7306 2008-02-15 00:52:38Z mike $"
*
- * Sample/test driver interface program for the Common UNIX Printing
- * System (CUPS).
+ * Sample/test driver interface program for CUPS.
*
* This program handles listing and installing both static PPD files
* in CUPS_DATADIR/model and dynamically generated PPD files using
* the driver helper programs in CUPS_SERVERBIN/driver.
*
- * Copyright 2007 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
@@ -28,8 +27,7 @@
* Include necessary headers...
*/
-#include
-#include
+#include
#include
diff --git a/driver/testrgb.c b/driver/testrgb.c
index 3fb0ae41a..b2bd27031 100644
--- a/driver/testrgb.c
+++ b/driver/testrgb.c
@@ -1,9 +1,9 @@
/*
* "$Id$"
*
- * Test the new RGB color separation code for ESP Print Pro.
+ * Test the new RGB color separation code for CUPS.
*
- * Copyright 2007 by Apple Inc.
+ * Copyright 2007-2010 by Apple Inc.
* Copyright 1993-2006 by Easy Software Products, All Rights Reserved.
*
* These coded instructions, statements, and computer programs are the
@@ -23,7 +23,7 @@
* Include necessary headers.
*/
-#include
+#include
#include "driver.h"
#include
diff --git a/filter/Dependencies b/filter/Dependencies
index 59fc5065d..fc17010de 100644
--- a/filter/Dependencies
+++ b/filter/Dependencies
@@ -3,122 +3,130 @@
image-bmp.o: image-private.h image.h ../cups/raster.h ../cups/cups.h
image-bmp.o: ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h
image-bmp.o: ../cups/array.h ../cups/file.h ../cups/language.h
-image-bmp.o: ../cups/debug.h ../cups/string.h ../config.h
+image-bmp.o: ../cups/debug-private.h ../cups/string-private.h ../config.h
image-colorspace.o: image-private.h image.h ../cups/raster.h ../cups/cups.h
image-colorspace.o: ../cups/ipp.h ../cups/http.h ../cups/versioning.h
image-colorspace.o: ../cups/ppd.h ../cups/array.h ../cups/file.h
-image-colorspace.o: ../cups/language.h ../cups/debug.h ../cups/string.h
-image-colorspace.o: ../config.h
+image-colorspace.o: ../cups/language.h ../cups/debug-private.h
+image-colorspace.o: ../cups/string-private.h ../config.h
image-gif.o: image-private.h image.h ../cups/raster.h ../cups/cups.h
image-gif.o: ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h
image-gif.o: ../cups/array.h ../cups/file.h ../cups/language.h
-image-gif.o: ../cups/debug.h ../cups/string.h ../config.h
+image-gif.o: ../cups/debug-private.h ../cups/string-private.h ../config.h
image-jpeg.o: image-private.h image.h ../cups/raster.h ../cups/cups.h
image-jpeg.o: ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h
image-jpeg.o: ../cups/array.h ../cups/file.h ../cups/language.h
-image-jpeg.o: ../cups/debug.h ../cups/string.h ../config.h
+image-jpeg.o: ../cups/debug-private.h ../cups/string-private.h ../config.h
image-photocd.o: image-private.h image.h ../cups/raster.h ../cups/cups.h
image-photocd.o: ../cups/ipp.h ../cups/http.h ../cups/versioning.h
image-photocd.o: ../cups/ppd.h ../cups/array.h ../cups/file.h
-image-photocd.o: ../cups/language.h ../cups/debug.h ../cups/string.h
-image-photocd.o: ../config.h
+image-photocd.o: ../cups/language.h ../cups/debug-private.h
+image-photocd.o: ../cups/string-private.h ../config.h
image-pix.o: image-private.h image.h ../cups/raster.h ../cups/cups.h
image-pix.o: ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h
image-pix.o: ../cups/array.h ../cups/file.h ../cups/language.h
-image-pix.o: ../cups/debug.h ../cups/string.h ../config.h
+image-pix.o: ../cups/debug-private.h ../cups/string-private.h ../config.h
image-png.o: image-private.h image.h ../cups/raster.h ../cups/cups.h
image-png.o: ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h
image-png.o: ../cups/array.h ../cups/file.h ../cups/language.h
-image-png.o: ../cups/debug.h ../cups/string.h ../config.h
+image-png.o: ../cups/debug-private.h ../cups/string-private.h ../config.h
image-pnm.o: image-private.h image.h ../cups/raster.h ../cups/cups.h
image-pnm.o: ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h
image-pnm.o: ../cups/array.h ../cups/file.h ../cups/language.h
-image-pnm.o: ../cups/debug.h ../cups/string.h ../config.h
+image-pnm.o: ../cups/debug-private.h ../cups/string-private.h ../config.h
image-sgi.o: image-private.h image.h ../cups/raster.h ../cups/cups.h
image-sgi.o: ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h
image-sgi.o: ../cups/array.h ../cups/file.h ../cups/language.h
-image-sgi.o: ../cups/debug.h ../cups/string.h ../config.h image-sgi.h
+image-sgi.o: ../cups/debug-private.h ../cups/string-private.h ../config.h
+image-sgi.o: image-sgi.h
image-sgilib.o: image-sgi.h
image-sun.o: image-private.h image.h ../cups/raster.h ../cups/cups.h
image-sun.o: ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h
image-sun.o: ../cups/array.h ../cups/file.h ../cups/language.h
-image-sun.o: ../cups/debug.h ../cups/string.h ../config.h
+image-sun.o: ../cups/debug-private.h ../cups/string-private.h ../config.h
image-tiff.o: image-private.h image.h ../cups/raster.h ../cups/cups.h
image-tiff.o: ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h
image-tiff.o: ../cups/array.h ../cups/file.h ../cups/language.h
-image-tiff.o: ../cups/debug.h ../cups/string.h ../config.h
+image-tiff.o: ../cups/debug-private.h ../cups/string-private.h ../config.h
image-zoom.o: image-private.h image.h ../cups/raster.h ../cups/cups.h
image-zoom.o: ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h
image-zoom.o: ../cups/array.h ../cups/file.h ../cups/language.h
-image-zoom.o: ../cups/debug.h ../cups/string.h ../config.h
+image-zoom.o: ../cups/debug-private.h ../cups/string-private.h ../config.h
image.o: image-private.h image.h ../cups/raster.h ../cups/cups.h
image.o: ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h
-image.o: ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h
-image.o: ../cups/string.h ../config.h
+image.o: ../cups/array.h ../cups/file.h ../cups/language.h
+image.o: ../cups/debug-private.h ../cups/string-private.h ../config.h
error.o: image-private.h image.h ../cups/raster.h ../cups/cups.h
error.o: ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h
-error.o: ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h
-error.o: ../cups/string.h ../config.h
-interpret.o: ../cups/string.h ../config.h image-private.h image.h
-interpret.o: ../cups/raster.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-interpret.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h
-interpret.o: ../cups/file.h ../cups/language.h ../cups/debug.h
+error.o: ../cups/array.h ../cups/file.h ../cups/language.h
+error.o: ../cups/debug-private.h ../cups/string-private.h ../config.h
+interpret.o: image-private.h image.h ../cups/raster.h ../cups/cups.h
+interpret.o: ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h
+interpret.o: ../cups/array.h ../cups/file.h ../cups/language.h
+interpret.o: ../cups/debug-private.h ../cups/string-private.h ../config.h
raster.o: image-private.h image.h ../cups/raster.h ../cups/cups.h
raster.o: ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h
-raster.o: ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h
-raster.o: ../cups/string.h ../config.h
-bannertops.o: pstext.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+raster.o: ../cups/array.h ../cups/file.h ../cups/language.h
+raster.o: ../cups/debug-private.h ../cups/string-private.h ../config.h
+bannertops.o: pstext.h common.h ../cups/string-private.h ../config.h
+bannertops.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h
bannertops.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h
bannertops.o: ../cups/file.h ../cups/language.h ../cups/language.h
-bannertops.o: ../cups/string.h ../config.h ../cups/transcode.h image.h
-bannertops.o: ../cups/raster.h ../cups/i18n.h ../cups/transcode.h
+bannertops.o: ../cups/transcode.h image.h ../cups/raster.h
+bannertops.o: ../cups/language-private.h
commandtops.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h
commandtops.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h
-commandtops.o: ../cups/file.h ../cups/language.h ../cups/string.h ../config.h
-commandtops.o: ../cups/sidechannel.h
-gziptoany.o: ../cups/file.h ../cups/versioning.h ../cups/string.h ../config.h
-gziptoany.o: ../cups/i18n.h ../cups/transcode.h
-imagetops.o: common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-imagetops.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h
-imagetops.o: ../cups/file.h ../cups/language.h ../cups/language.h
-imagetops.o: ../cups/string.h ../config.h image.h ../cups/raster.h
-imagetops.o: ../cups/i18n.h ../cups/transcode.h
-imagetoraster.o: common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-imagetoraster.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h
-imagetoraster.o: ../cups/file.h ../cups/language.h ../cups/language.h
-imagetoraster.o: ../cups/string.h ../config.h image-private.h image.h
-imagetoraster.o: ../cups/raster.h ../cups/debug.h ../cups/i18n.h
-imagetoraster.o: ../cups/transcode.h
-common.o: common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-common.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-common.o: ../cups/language.h ../cups/language.h ../cups/string.h ../config.h
+commandtops.o: ../cups/file.h ../cups/language.h ../cups/string-private.h
+commandtops.o: ../config.h ../cups/sidechannel.h
+gziptoany.o: ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h
+gziptoany.o: ../cups/http.h ../cups/versioning.h ../cups/ppd.h
+gziptoany.o: ../cups/array.h ../cups/file.h ../cups/language.h
+gziptoany.o: ../cups/string-private.h ../config.h ../cups/debug-private.h
+gziptoany.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h
+gziptoany.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h
+gziptoany.o: ../cups/transcode.h ../cups/pwg-private.h
+imagetops.o: common.h ../cups/string-private.h ../config.h ../cups/cups.h
+imagetops.o: ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h
+imagetops.o: ../cups/array.h ../cups/file.h ../cups/language.h
+imagetops.o: ../cups/language.h image.h ../cups/raster.h
+imagetoraster.o: common.h ../cups/string-private.h ../config.h ../cups/cups.h
+imagetoraster.o: ../cups/ipp.h ../cups/http.h ../cups/versioning.h
+imagetoraster.o: ../cups/ppd.h ../cups/array.h ../cups/file.h
+imagetoraster.o: ../cups/language.h ../cups/language.h image-private.h
+imagetoraster.o: image.h ../cups/raster.h ../cups/debug-private.h
+common.o: common.h ../cups/string-private.h ../config.h ../cups/cups.h
+common.o: ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h
+common.o: ../cups/array.h ../cups/file.h ../cups/language.h
+common.o: ../cups/language.h
pdftops.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/versioning.h
pdftops.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-pdftops.o: ../cups/string.h ../config.h ../cups/i18n.h ../cups/transcode.h
-pstext.o: pstext.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-pstext.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-pstext.o: ../cups/language.h ../cups/language.h ../cups/string.h ../config.h
-pstext.o: ../cups/transcode.h ../cups/i18n.h ../cups/transcode.h
-pstops.o: common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-pstops.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-pstops.o: ../cups/language.h ../cups/language.h ../cups/string.h ../config.h
-pstops.o: ../cups/file.h ../cups/array.h ../cups/i18n.h ../cups/transcode.h
+pstext.o: pstext.h common.h ../cups/string-private.h ../config.h
+pstext.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/versioning.h
+pstext.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+pstext.o: ../cups/language.h ../cups/transcode.h ../cups/language-private.h
+pstops.o: common.h ../cups/string-private.h ../config.h ../cups/cups.h
+pstops.o: ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h
+pstops.o: ../cups/array.h ../cups/file.h ../cups/language.h
+pstops.o: ../cups/language.h ../cups/file.h ../cups/array.h
+pstops.o: ../cups/language-private.h ../cups/transcode.h
rasterbench.o: ../config.h ../cups/raster.h ../cups/cups.h ../cups/ipp.h
rasterbench.o: ../cups/http.h ../cups/versioning.h ../cups/ppd.h
rasterbench.o: ../cups/array.h ../cups/file.h ../cups/language.h
rastertoepson.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h
rastertoepson.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h
rastertoepson.o: ../cups/file.h ../cups/language.h ../cups/ppd.h
-rastertoepson.o: ../cups/string.h ../config.h ../cups/i18n.h
-rastertoepson.o: ../cups/transcode.h ../cups/raster.h
+rastertoepson.o: ../cups/string-private.h ../config.h
+rastertoepson.o: ../cups/language-private.h ../cups/transcode.h
+rastertoepson.o: ../cups/raster.h
rastertohp.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h
rastertohp.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h
-rastertohp.o: ../cups/file.h ../cups/language.h ../cups/string.h ../config.h
-rastertohp.o: ../cups/i18n.h ../cups/transcode.h ../cups/raster.h
+rastertohp.o: ../cups/file.h ../cups/language.h ../cups/string-private.h
+rastertohp.o: ../config.h ../cups/language-private.h ../cups/transcode.h
+rastertohp.o: ../cups/raster.h
rastertolabel.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h
rastertolabel.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h
-rastertolabel.o: ../cups/file.h ../cups/language.h ../cups/string.h
-rastertolabel.o: ../config.h ../cups/i18n.h ../cups/transcode.h
+rastertolabel.o: ../cups/file.h ../cups/language.h ../cups/string-private.h
+rastertolabel.o: ../config.h ../cups/language-private.h ../cups/transcode.h
rastertolabel.o: ../cups/raster.h
testimage.o: image.h ../cups/raster.h ../cups/cups.h ../cups/ipp.h
testimage.o: ../cups/http.h ../cups/versioning.h ../cups/ppd.h
@@ -126,137 +134,145 @@ testimage.o: ../cups/array.h ../cups/file.h ../cups/language.h
testraster.o: image-private.h image.h ../cups/raster.h ../cups/cups.h
testraster.o: ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h
testraster.o: ../cups/array.h ../cups/file.h ../cups/language.h
-testraster.o: ../cups/debug.h ../cups/string.h ../config.h
-textcommon.o: textcommon.h common.h ../cups/cups.h ../cups/ipp.h
-textcommon.o: ../cups/http.h ../cups/versioning.h ../cups/ppd.h
-textcommon.o: ../cups/array.h ../cups/file.h ../cups/language.h
-textcommon.o: ../cups/language.h ../cups/string.h ../config.h ../cups/i18n.h
-textcommon.o: ../cups/transcode.h
-texttops.o: textcommon.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-texttops.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-texttops.o: ../cups/language.h ../cups/language.h ../cups/string.h
-texttops.o: ../config.h ../cups/i18n.h ../cups/transcode.h
+testraster.o: ../cups/debug-private.h ../cups/string-private.h ../config.h
+textcommon.o: textcommon.h common.h ../cups/string-private.h ../config.h
+textcommon.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h
+textcommon.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h
+textcommon.o: ../cups/file.h ../cups/language.h ../cups/language.h
+textcommon.o: ../cups/language-private.h ../cups/transcode.h
+texttops.o: textcommon.h common.h ../cups/string-private.h ../config.h
+texttops.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/versioning.h
+texttops.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+texttops.o: ../cups/language.h ../cups/language-private.h ../cups/transcode.h
# DO NOT DELETE
image-bmp.32.o: image-bmp.c image-private.h image.h ../cups/raster.h ../cups/cups.h
image-bmp.32.o: image-bmp.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h
image-bmp.32.o: image-bmp.c ../cups/array.h ../cups/file.h ../cups/language.h
-image-bmp.32.o: image-bmp.c ../cups/debug.h ../cups/string.h ../config.h
+image-bmp.32.o: image-bmp.c ../cups/debug-private.h ../cups/string-private.h ../config.h
image-colorspace.32.o: image-colorspace.c image-private.h image.h ../cups/raster.h ../cups/cups.h
image-colorspace.32.o: image-colorspace.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h
image-colorspace.32.o: image-colorspace.c ../cups/ppd.h ../cups/array.h ../cups/file.h
-image-colorspace.32.o: image-colorspace.c ../cups/language.h ../cups/debug.h ../cups/string.h
-image-colorspace.32.o: image-colorspace.c ../config.h
+image-colorspace.32.o: image-colorspace.c ../cups/language.h ../cups/debug-private.h
+image-colorspace.32.o: image-colorspace.c ../cups/string-private.h ../config.h
image-gif.32.o: image-gif.c image-private.h image.h ../cups/raster.h ../cups/cups.h
image-gif.32.o: image-gif.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h
image-gif.32.o: image-gif.c ../cups/array.h ../cups/file.h ../cups/language.h
-image-gif.32.o: image-gif.c ../cups/debug.h ../cups/string.h ../config.h
+image-gif.32.o: image-gif.c ../cups/debug-private.h ../cups/string-private.h ../config.h
image-jpeg.32.o: image-jpeg.c image-private.h image.h ../cups/raster.h ../cups/cups.h
image-jpeg.32.o: image-jpeg.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h
image-jpeg.32.o: image-jpeg.c ../cups/array.h ../cups/file.h ../cups/language.h
-image-jpeg.32.o: image-jpeg.c ../cups/debug.h ../cups/string.h ../config.h
+image-jpeg.32.o: image-jpeg.c ../cups/debug-private.h ../cups/string-private.h ../config.h
image-photocd.32.o: image-photocd.c image-private.h image.h ../cups/raster.h ../cups/cups.h
image-photocd.32.o: image-photocd.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h
image-photocd.32.o: image-photocd.c ../cups/ppd.h ../cups/array.h ../cups/file.h
-image-photocd.32.o: image-photocd.c ../cups/language.h ../cups/debug.h ../cups/string.h
-image-photocd.32.o: image-photocd.c ../config.h
+image-photocd.32.o: image-photocd.c ../cups/language.h ../cups/debug-private.h
+image-photocd.32.o: image-photocd.c ../cups/string-private.h ../config.h
image-pix.32.o: image-pix.c image-private.h image.h ../cups/raster.h ../cups/cups.h
image-pix.32.o: image-pix.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h
image-pix.32.o: image-pix.c ../cups/array.h ../cups/file.h ../cups/language.h
-image-pix.32.o: image-pix.c ../cups/debug.h ../cups/string.h ../config.h
+image-pix.32.o: image-pix.c ../cups/debug-private.h ../cups/string-private.h ../config.h
image-png.32.o: image-png.c image-private.h image.h ../cups/raster.h ../cups/cups.h
image-png.32.o: image-png.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h
image-png.32.o: image-png.c ../cups/array.h ../cups/file.h ../cups/language.h
-image-png.32.o: image-png.c ../cups/debug.h ../cups/string.h ../config.h
+image-png.32.o: image-png.c ../cups/debug-private.h ../cups/string-private.h ../config.h
image-pnm.32.o: image-pnm.c image-private.h image.h ../cups/raster.h ../cups/cups.h
image-pnm.32.o: image-pnm.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h
image-pnm.32.o: image-pnm.c ../cups/array.h ../cups/file.h ../cups/language.h
-image-pnm.32.o: image-pnm.c ../cups/debug.h ../cups/string.h ../config.h
+image-pnm.32.o: image-pnm.c ../cups/debug-private.h ../cups/string-private.h ../config.h
image-sgi.32.o: image-sgi.c image-private.h image.h ../cups/raster.h ../cups/cups.h
image-sgi.32.o: image-sgi.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h
image-sgi.32.o: image-sgi.c ../cups/array.h ../cups/file.h ../cups/language.h
-image-sgi.32.o: image-sgi.c ../cups/debug.h ../cups/string.h ../config.h image-sgi.h
+image-sgi.32.o: image-sgi.c ../cups/debug-private.h ../cups/string-private.h ../config.h
+image-sgi.32.o: image-sgi.c image-sgi.h
image-sgilib.32.o: image-sgilib.c image-sgi.h
image-sun.32.o: image-sun.c image-private.h image.h ../cups/raster.h ../cups/cups.h
image-sun.32.o: image-sun.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h
image-sun.32.o: image-sun.c ../cups/array.h ../cups/file.h ../cups/language.h
-image-sun.32.o: image-sun.c ../cups/debug.h ../cups/string.h ../config.h
+image-sun.32.o: image-sun.c ../cups/debug-private.h ../cups/string-private.h ../config.h
image-tiff.32.o: image-tiff.c image-private.h image.h ../cups/raster.h ../cups/cups.h
image-tiff.32.o: image-tiff.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h
image-tiff.32.o: image-tiff.c ../cups/array.h ../cups/file.h ../cups/language.h
-image-tiff.32.o: image-tiff.c ../cups/debug.h ../cups/string.h ../config.h
+image-tiff.32.o: image-tiff.c ../cups/debug-private.h ../cups/string-private.h ../config.h
image-zoom.32.o: image-zoom.c image-private.h image.h ../cups/raster.h ../cups/cups.h
image-zoom.32.o: image-zoom.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h
image-zoom.32.o: image-zoom.c ../cups/array.h ../cups/file.h ../cups/language.h
-image-zoom.32.o: image-zoom.c ../cups/debug.h ../cups/string.h ../config.h
+image-zoom.32.o: image-zoom.c ../cups/debug-private.h ../cups/string-private.h ../config.h
image.32.o: image.c image-private.h image.h ../cups/raster.h ../cups/cups.h
image.32.o: image.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h
-image.32.o: image.c ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h
-image.32.o: image.c ../cups/string.h ../config.h
+image.32.o: image.c ../cups/array.h ../cups/file.h ../cups/language.h
+image.32.o: image.c ../cups/debug-private.h ../cups/string-private.h ../config.h
error.32.o: error.c image-private.h image.h ../cups/raster.h ../cups/cups.h
error.32.o: error.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h
-error.32.o: error.c ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h
-error.32.o: error.c ../cups/string.h ../config.h
-interpret.32.o: interpret.c ../cups/string.h ../config.h image-private.h image.h
-interpret.32.o: interpret.c ../cups/raster.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-interpret.32.o: interpret.c ../cups/versioning.h ../cups/ppd.h ../cups/array.h
-interpret.32.o: interpret.c ../cups/file.h ../cups/language.h ../cups/debug.h
+error.32.o: error.c ../cups/array.h ../cups/file.h ../cups/language.h
+error.32.o: error.c ../cups/debug-private.h ../cups/string-private.h ../config.h
+interpret.32.o: interpret.c image-private.h image.h ../cups/raster.h ../cups/cups.h
+interpret.32.o: interpret.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h
+interpret.32.o: interpret.c ../cups/array.h ../cups/file.h ../cups/language.h
+interpret.32.o: interpret.c ../cups/debug-private.h ../cups/string-private.h ../config.h
raster.32.o: raster.c image-private.h image.h ../cups/raster.h ../cups/cups.h
raster.32.o: raster.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h
-raster.32.o: raster.c ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h
-raster.32.o: raster.c ../cups/string.h ../config.h
-bannertops.32.o: bannertops.c pstext.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+raster.32.o: raster.c ../cups/array.h ../cups/file.h ../cups/language.h
+raster.32.o: raster.c ../cups/debug-private.h ../cups/string-private.h ../config.h
+bannertops.32.o: bannertops.c pstext.h common.h ../cups/string-private.h ../config.h
+bannertops.32.o: bannertops.c ../cups/cups.h ../cups/ipp.h ../cups/http.h
bannertops.32.o: bannertops.c ../cups/versioning.h ../cups/ppd.h ../cups/array.h
bannertops.32.o: bannertops.c ../cups/file.h ../cups/language.h ../cups/language.h
-bannertops.32.o: bannertops.c ../cups/string.h ../config.h ../cups/transcode.h image.h
-bannertops.32.o: bannertops.c ../cups/raster.h ../cups/i18n.h ../cups/transcode.h
+bannertops.32.o: bannertops.c ../cups/transcode.h image.h ../cups/raster.h
+bannertops.32.o: bannertops.c ../cups/language-private.h
commandtops.32.o: commandtops.c ../cups/cups.h ../cups/ipp.h ../cups/http.h
commandtops.32.o: commandtops.c ../cups/versioning.h ../cups/ppd.h ../cups/array.h
-commandtops.32.o: commandtops.c ../cups/file.h ../cups/language.h ../cups/string.h ../config.h
-commandtops.32.o: commandtops.c ../cups/sidechannel.h
-gziptoany.32.o: gziptoany.c ../cups/file.h ../cups/versioning.h ../cups/string.h ../config.h
-gziptoany.32.o: gziptoany.c ../cups/i18n.h ../cups/transcode.h
-imagetops.32.o: imagetops.c common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-imagetops.32.o: imagetops.c ../cups/versioning.h ../cups/ppd.h ../cups/array.h
-imagetops.32.o: imagetops.c ../cups/file.h ../cups/language.h ../cups/language.h
-imagetops.32.o: imagetops.c ../cups/string.h ../config.h image.h ../cups/raster.h
-imagetops.32.o: imagetops.c ../cups/i18n.h ../cups/transcode.h
-imagetoraster.32.o: imagetoraster.c common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-imagetoraster.32.o: imagetoraster.c ../cups/versioning.h ../cups/ppd.h ../cups/array.h
-imagetoraster.32.o: imagetoraster.c ../cups/file.h ../cups/language.h ../cups/language.h
-imagetoraster.32.o: imagetoraster.c ../cups/string.h ../config.h image-private.h image.h
-imagetoraster.32.o: imagetoraster.c ../cups/raster.h ../cups/debug.h ../cups/i18n.h
-imagetoraster.32.o: imagetoraster.c ../cups/transcode.h
-common.32.o: common.c common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-common.32.o: common.c ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-common.32.o: common.c ../cups/language.h ../cups/language.h ../cups/string.h ../config.h
+commandtops.32.o: commandtops.c ../cups/file.h ../cups/language.h ../cups/string-private.h
+commandtops.32.o: commandtops.c ../config.h ../cups/sidechannel.h
+gziptoany.32.o: gziptoany.c ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h
+gziptoany.32.o: gziptoany.c ../cups/http.h ../cups/versioning.h ../cups/ppd.h
+gziptoany.32.o: gziptoany.c ../cups/array.h ../cups/file.h ../cups/language.h
+gziptoany.32.o: gziptoany.c ../cups/string-private.h ../config.h ../cups/debug-private.h
+gziptoany.32.o: gziptoany.c ../cups/http-private.h ../cups/http.h ../cups/md5-private.h
+gziptoany.32.o: gziptoany.c ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h
+gziptoany.32.o: gziptoany.c ../cups/transcode.h ../cups/pwg-private.h
+imagetops.32.o: imagetops.c common.h ../cups/string-private.h ../config.h ../cups/cups.h
+imagetops.32.o: imagetops.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h
+imagetops.32.o: imagetops.c ../cups/array.h ../cups/file.h ../cups/language.h
+imagetops.32.o: imagetops.c ../cups/language.h image.h ../cups/raster.h
+imagetoraster.32.o: imagetoraster.c common.h ../cups/string-private.h ../config.h ../cups/cups.h
+imagetoraster.32.o: imagetoraster.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h
+imagetoraster.32.o: imagetoraster.c ../cups/ppd.h ../cups/array.h ../cups/file.h
+imagetoraster.32.o: imagetoraster.c ../cups/language.h ../cups/language.h image-private.h
+imagetoraster.32.o: imagetoraster.c image.h ../cups/raster.h ../cups/debug-private.h
+common.32.o: common.c common.h ../cups/string-private.h ../config.h ../cups/cups.h
+common.32.o: common.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h
+common.32.o: common.c ../cups/array.h ../cups/file.h ../cups/language.h
+common.32.o: common.c ../cups/language.h
pdftops.32.o: pdftops.c ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/versioning.h
pdftops.32.o: pdftops.c ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-pdftops.32.o: pdftops.c ../cups/string.h ../config.h ../cups/i18n.h ../cups/transcode.h
-pstext.32.o: pstext.c pstext.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-pstext.32.o: pstext.c ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-pstext.32.o: pstext.c ../cups/language.h ../cups/language.h ../cups/string.h ../config.h
-pstext.32.o: pstext.c ../cups/transcode.h ../cups/i18n.h ../cups/transcode.h
-pstops.32.o: pstops.c common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-pstops.32.o: pstops.c ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-pstops.32.o: pstops.c ../cups/language.h ../cups/language.h ../cups/string.h ../config.h
-pstops.32.o: pstops.c ../cups/file.h ../cups/array.h ../cups/i18n.h ../cups/transcode.h
+pstext.32.o: pstext.c pstext.h common.h ../cups/string-private.h ../config.h
+pstext.32.o: pstext.c ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/versioning.h
+pstext.32.o: pstext.c ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+pstext.32.o: pstext.c ../cups/language.h ../cups/transcode.h ../cups/language-private.h
+pstops.32.o: pstops.c common.h ../cups/string-private.h ../config.h ../cups/cups.h
+pstops.32.o: pstops.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h
+pstops.32.o: pstops.c ../cups/array.h ../cups/file.h ../cups/language.h
+pstops.32.o: pstops.c ../cups/language.h ../cups/file.h ../cups/array.h
+pstops.32.o: pstops.c ../cups/language-private.h ../cups/transcode.h
rasterbench.32.o: rasterbench.c ../config.h ../cups/raster.h ../cups/cups.h ../cups/ipp.h
rasterbench.32.o: rasterbench.c ../cups/http.h ../cups/versioning.h ../cups/ppd.h
rasterbench.32.o: rasterbench.c ../cups/array.h ../cups/file.h ../cups/language.h
rastertoepson.32.o: rastertoepson.c ../cups/cups.h ../cups/ipp.h ../cups/http.h
rastertoepson.32.o: rastertoepson.c ../cups/versioning.h ../cups/ppd.h ../cups/array.h
rastertoepson.32.o: rastertoepson.c ../cups/file.h ../cups/language.h ../cups/ppd.h
-rastertoepson.32.o: rastertoepson.c ../cups/string.h ../config.h ../cups/i18n.h
-rastertoepson.32.o: rastertoepson.c ../cups/transcode.h ../cups/raster.h
+rastertoepson.32.o: rastertoepson.c ../cups/string-private.h ../config.h
+rastertoepson.32.o: rastertoepson.c ../cups/language-private.h ../cups/transcode.h
+rastertoepson.32.o: rastertoepson.c ../cups/raster.h
rastertohp.32.o: rastertohp.c ../cups/cups.h ../cups/ipp.h ../cups/http.h
rastertohp.32.o: rastertohp.c ../cups/versioning.h ../cups/ppd.h ../cups/array.h
-rastertohp.32.o: rastertohp.c ../cups/file.h ../cups/language.h ../cups/string.h ../config.h
-rastertohp.32.o: rastertohp.c ../cups/i18n.h ../cups/transcode.h ../cups/raster.h
+rastertohp.32.o: rastertohp.c ../cups/file.h ../cups/language.h ../cups/string-private.h
+rastertohp.32.o: rastertohp.c ../config.h ../cups/language-private.h ../cups/transcode.h
+rastertohp.32.o: rastertohp.c ../cups/raster.h
rastertolabel.32.o: rastertolabel.c ../cups/cups.h ../cups/ipp.h ../cups/http.h
rastertolabel.32.o: rastertolabel.c ../cups/versioning.h ../cups/ppd.h ../cups/array.h
-rastertolabel.32.o: rastertolabel.c ../cups/file.h ../cups/language.h ../cups/string.h
-rastertolabel.32.o: rastertolabel.c ../config.h ../cups/i18n.h ../cups/transcode.h
+rastertolabel.32.o: rastertolabel.c ../cups/file.h ../cups/language.h ../cups/string-private.h
+rastertolabel.32.o: rastertolabel.c ../config.h ../cups/language-private.h ../cups/transcode.h
rastertolabel.32.o: rastertolabel.c ../cups/raster.h
testimage.32.o: testimage.c image.h ../cups/raster.h ../cups/cups.h ../cups/ipp.h
testimage.32.o: testimage.c ../cups/http.h ../cups/versioning.h ../cups/ppd.h
@@ -264,137 +280,145 @@ testimage.32.o: testimage.c ../cups/array.h ../cups/file.h ../cups/language.h
testraster.32.o: testraster.c image-private.h image.h ../cups/raster.h ../cups/cups.h
testraster.32.o: testraster.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h
testraster.32.o: testraster.c ../cups/array.h ../cups/file.h ../cups/language.h
-testraster.32.o: testraster.c ../cups/debug.h ../cups/string.h ../config.h
-textcommon.32.o: textcommon.c textcommon.h common.h ../cups/cups.h ../cups/ipp.h
-textcommon.32.o: textcommon.c ../cups/http.h ../cups/versioning.h ../cups/ppd.h
-textcommon.32.o: textcommon.c ../cups/array.h ../cups/file.h ../cups/language.h
-textcommon.32.o: textcommon.c ../cups/language.h ../cups/string.h ../config.h ../cups/i18n.h
-textcommon.32.o: textcommon.c ../cups/transcode.h
-texttops.32.o: texttops.c textcommon.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-texttops.32.o: texttops.c ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-texttops.32.o: texttops.c ../cups/language.h ../cups/language.h ../cups/string.h
-texttops.32.o: texttops.c ../config.h ../cups/i18n.h ../cups/transcode.h
+testraster.32.o: testraster.c ../cups/debug-private.h ../cups/string-private.h ../config.h
+textcommon.32.o: textcommon.c textcommon.h common.h ../cups/string-private.h ../config.h
+textcommon.32.o: textcommon.c ../cups/cups.h ../cups/ipp.h ../cups/http.h
+textcommon.32.o: textcommon.c ../cups/versioning.h ../cups/ppd.h ../cups/array.h
+textcommon.32.o: textcommon.c ../cups/file.h ../cups/language.h ../cups/language.h
+textcommon.32.o: textcommon.c ../cups/language-private.h ../cups/transcode.h
+texttops.32.o: texttops.c textcommon.h common.h ../cups/string-private.h ../config.h
+texttops.32.o: texttops.c ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/versioning.h
+texttops.32.o: texttops.c ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+texttops.32.o: texttops.c ../cups/language.h ../cups/language-private.h ../cups/transcode.h
# DO NOT DELETE
image-bmp.64.o: image-bmp.c image-private.h image.h ../cups/raster.h ../cups/cups.h
image-bmp.64.o: image-bmp.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h
image-bmp.64.o: image-bmp.c ../cups/array.h ../cups/file.h ../cups/language.h
-image-bmp.64.o: image-bmp.c ../cups/debug.h ../cups/string.h ../config.h
+image-bmp.64.o: image-bmp.c ../cups/debug-private.h ../cups/string-private.h ../config.h
image-colorspace.64.o: image-colorspace.c image-private.h image.h ../cups/raster.h ../cups/cups.h
image-colorspace.64.o: image-colorspace.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h
image-colorspace.64.o: image-colorspace.c ../cups/ppd.h ../cups/array.h ../cups/file.h
-image-colorspace.64.o: image-colorspace.c ../cups/language.h ../cups/debug.h ../cups/string.h
-image-colorspace.64.o: image-colorspace.c ../config.h
+image-colorspace.64.o: image-colorspace.c ../cups/language.h ../cups/debug-private.h
+image-colorspace.64.o: image-colorspace.c ../cups/string-private.h ../config.h
image-gif.64.o: image-gif.c image-private.h image.h ../cups/raster.h ../cups/cups.h
image-gif.64.o: image-gif.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h
image-gif.64.o: image-gif.c ../cups/array.h ../cups/file.h ../cups/language.h
-image-gif.64.o: image-gif.c ../cups/debug.h ../cups/string.h ../config.h
+image-gif.64.o: image-gif.c ../cups/debug-private.h ../cups/string-private.h ../config.h
image-jpeg.64.o: image-jpeg.c image-private.h image.h ../cups/raster.h ../cups/cups.h
image-jpeg.64.o: image-jpeg.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h
image-jpeg.64.o: image-jpeg.c ../cups/array.h ../cups/file.h ../cups/language.h
-image-jpeg.64.o: image-jpeg.c ../cups/debug.h ../cups/string.h ../config.h
+image-jpeg.64.o: image-jpeg.c ../cups/debug-private.h ../cups/string-private.h ../config.h
image-photocd.64.o: image-photocd.c image-private.h image.h ../cups/raster.h ../cups/cups.h
image-photocd.64.o: image-photocd.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h
image-photocd.64.o: image-photocd.c ../cups/ppd.h ../cups/array.h ../cups/file.h
-image-photocd.64.o: image-photocd.c ../cups/language.h ../cups/debug.h ../cups/string.h
-image-photocd.64.o: image-photocd.c ../config.h
+image-photocd.64.o: image-photocd.c ../cups/language.h ../cups/debug-private.h
+image-photocd.64.o: image-photocd.c ../cups/string-private.h ../config.h
image-pix.64.o: image-pix.c image-private.h image.h ../cups/raster.h ../cups/cups.h
image-pix.64.o: image-pix.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h
image-pix.64.o: image-pix.c ../cups/array.h ../cups/file.h ../cups/language.h
-image-pix.64.o: image-pix.c ../cups/debug.h ../cups/string.h ../config.h
+image-pix.64.o: image-pix.c ../cups/debug-private.h ../cups/string-private.h ../config.h
image-png.64.o: image-png.c image-private.h image.h ../cups/raster.h ../cups/cups.h
image-png.64.o: image-png.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h
image-png.64.o: image-png.c ../cups/array.h ../cups/file.h ../cups/language.h
-image-png.64.o: image-png.c ../cups/debug.h ../cups/string.h ../config.h
+image-png.64.o: image-png.c ../cups/debug-private.h ../cups/string-private.h ../config.h
image-pnm.64.o: image-pnm.c image-private.h image.h ../cups/raster.h ../cups/cups.h
image-pnm.64.o: image-pnm.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h
image-pnm.64.o: image-pnm.c ../cups/array.h ../cups/file.h ../cups/language.h
-image-pnm.64.o: image-pnm.c ../cups/debug.h ../cups/string.h ../config.h
+image-pnm.64.o: image-pnm.c ../cups/debug-private.h ../cups/string-private.h ../config.h
image-sgi.64.o: image-sgi.c image-private.h image.h ../cups/raster.h ../cups/cups.h
image-sgi.64.o: image-sgi.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h
image-sgi.64.o: image-sgi.c ../cups/array.h ../cups/file.h ../cups/language.h
-image-sgi.64.o: image-sgi.c ../cups/debug.h ../cups/string.h ../config.h image-sgi.h
+image-sgi.64.o: image-sgi.c ../cups/debug-private.h ../cups/string-private.h ../config.h
+image-sgi.64.o: image-sgi.c image-sgi.h
image-sgilib.64.o: image-sgilib.c image-sgi.h
image-sun.64.o: image-sun.c image-private.h image.h ../cups/raster.h ../cups/cups.h
image-sun.64.o: image-sun.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h
image-sun.64.o: image-sun.c ../cups/array.h ../cups/file.h ../cups/language.h
-image-sun.64.o: image-sun.c ../cups/debug.h ../cups/string.h ../config.h
+image-sun.64.o: image-sun.c ../cups/debug-private.h ../cups/string-private.h ../config.h
image-tiff.64.o: image-tiff.c image-private.h image.h ../cups/raster.h ../cups/cups.h
image-tiff.64.o: image-tiff.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h
image-tiff.64.o: image-tiff.c ../cups/array.h ../cups/file.h ../cups/language.h
-image-tiff.64.o: image-tiff.c ../cups/debug.h ../cups/string.h ../config.h
+image-tiff.64.o: image-tiff.c ../cups/debug-private.h ../cups/string-private.h ../config.h
image-zoom.64.o: image-zoom.c image-private.h image.h ../cups/raster.h ../cups/cups.h
image-zoom.64.o: image-zoom.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h
image-zoom.64.o: image-zoom.c ../cups/array.h ../cups/file.h ../cups/language.h
-image-zoom.64.o: image-zoom.c ../cups/debug.h ../cups/string.h ../config.h
+image-zoom.64.o: image-zoom.c ../cups/debug-private.h ../cups/string-private.h ../config.h
image.64.o: image.c image-private.h image.h ../cups/raster.h ../cups/cups.h
image.64.o: image.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h
-image.64.o: image.c ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h
-image.64.o: image.c ../cups/string.h ../config.h
+image.64.o: image.c ../cups/array.h ../cups/file.h ../cups/language.h
+image.64.o: image.c ../cups/debug-private.h ../cups/string-private.h ../config.h
error.64.o: error.c image-private.h image.h ../cups/raster.h ../cups/cups.h
error.64.o: error.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h
-error.64.o: error.c ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h
-error.64.o: error.c ../cups/string.h ../config.h
-interpret.64.o: interpret.c ../cups/string.h ../config.h image-private.h image.h
-interpret.64.o: interpret.c ../cups/raster.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-interpret.64.o: interpret.c ../cups/versioning.h ../cups/ppd.h ../cups/array.h
-interpret.64.o: interpret.c ../cups/file.h ../cups/language.h ../cups/debug.h
+error.64.o: error.c ../cups/array.h ../cups/file.h ../cups/language.h
+error.64.o: error.c ../cups/debug-private.h ../cups/string-private.h ../config.h
+interpret.64.o: interpret.c image-private.h image.h ../cups/raster.h ../cups/cups.h
+interpret.64.o: interpret.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h
+interpret.64.o: interpret.c ../cups/array.h ../cups/file.h ../cups/language.h
+interpret.64.o: interpret.c ../cups/debug-private.h ../cups/string-private.h ../config.h
raster.64.o: raster.c image-private.h image.h ../cups/raster.h ../cups/cups.h
raster.64.o: raster.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h
-raster.64.o: raster.c ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h
-raster.64.o: raster.c ../cups/string.h ../config.h
-bannertops.64.o: bannertops.c pstext.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+raster.64.o: raster.c ../cups/array.h ../cups/file.h ../cups/language.h
+raster.64.o: raster.c ../cups/debug-private.h ../cups/string-private.h ../config.h
+bannertops.64.o: bannertops.c pstext.h common.h ../cups/string-private.h ../config.h
+bannertops.64.o: bannertops.c ../cups/cups.h ../cups/ipp.h ../cups/http.h
bannertops.64.o: bannertops.c ../cups/versioning.h ../cups/ppd.h ../cups/array.h
bannertops.64.o: bannertops.c ../cups/file.h ../cups/language.h ../cups/language.h
-bannertops.64.o: bannertops.c ../cups/string.h ../config.h ../cups/transcode.h image.h
-bannertops.64.o: bannertops.c ../cups/raster.h ../cups/i18n.h ../cups/transcode.h
+bannertops.64.o: bannertops.c ../cups/transcode.h image.h ../cups/raster.h
+bannertops.64.o: bannertops.c ../cups/language-private.h
commandtops.64.o: commandtops.c ../cups/cups.h ../cups/ipp.h ../cups/http.h
commandtops.64.o: commandtops.c ../cups/versioning.h ../cups/ppd.h ../cups/array.h
-commandtops.64.o: commandtops.c ../cups/file.h ../cups/language.h ../cups/string.h ../config.h
-commandtops.64.o: commandtops.c ../cups/sidechannel.h
-gziptoany.64.o: gziptoany.c ../cups/file.h ../cups/versioning.h ../cups/string.h ../config.h
-gziptoany.64.o: gziptoany.c ../cups/i18n.h ../cups/transcode.h
-imagetops.64.o: imagetops.c common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-imagetops.64.o: imagetops.c ../cups/versioning.h ../cups/ppd.h ../cups/array.h
-imagetops.64.o: imagetops.c ../cups/file.h ../cups/language.h ../cups/language.h
-imagetops.64.o: imagetops.c ../cups/string.h ../config.h image.h ../cups/raster.h
-imagetops.64.o: imagetops.c ../cups/i18n.h ../cups/transcode.h
-imagetoraster.64.o: imagetoraster.c common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-imagetoraster.64.o: imagetoraster.c ../cups/versioning.h ../cups/ppd.h ../cups/array.h
-imagetoraster.64.o: imagetoraster.c ../cups/file.h ../cups/language.h ../cups/language.h
-imagetoraster.64.o: imagetoraster.c ../cups/string.h ../config.h image-private.h image.h
-imagetoraster.64.o: imagetoraster.c ../cups/raster.h ../cups/debug.h ../cups/i18n.h
-imagetoraster.64.o: imagetoraster.c ../cups/transcode.h
-common.64.o: common.c common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-common.64.o: common.c ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-common.64.o: common.c ../cups/language.h ../cups/language.h ../cups/string.h ../config.h
+commandtops.64.o: commandtops.c ../cups/file.h ../cups/language.h ../cups/string-private.h
+commandtops.64.o: commandtops.c ../config.h ../cups/sidechannel.h
+gziptoany.64.o: gziptoany.c ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h
+gziptoany.64.o: gziptoany.c ../cups/http.h ../cups/versioning.h ../cups/ppd.h
+gziptoany.64.o: gziptoany.c ../cups/array.h ../cups/file.h ../cups/language.h
+gziptoany.64.o: gziptoany.c ../cups/string-private.h ../config.h ../cups/debug-private.h
+gziptoany.64.o: gziptoany.c ../cups/http-private.h ../cups/http.h ../cups/md5-private.h
+gziptoany.64.o: gziptoany.c ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h
+gziptoany.64.o: gziptoany.c ../cups/transcode.h ../cups/pwg-private.h
+imagetops.64.o: imagetops.c common.h ../cups/string-private.h ../config.h ../cups/cups.h
+imagetops.64.o: imagetops.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h
+imagetops.64.o: imagetops.c ../cups/array.h ../cups/file.h ../cups/language.h
+imagetops.64.o: imagetops.c ../cups/language.h image.h ../cups/raster.h
+imagetoraster.64.o: imagetoraster.c common.h ../cups/string-private.h ../config.h ../cups/cups.h
+imagetoraster.64.o: imagetoraster.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h
+imagetoraster.64.o: imagetoraster.c ../cups/ppd.h ../cups/array.h ../cups/file.h
+imagetoraster.64.o: imagetoraster.c ../cups/language.h ../cups/language.h image-private.h
+imagetoraster.64.o: imagetoraster.c image.h ../cups/raster.h ../cups/debug-private.h
+common.64.o: common.c common.h ../cups/string-private.h ../config.h ../cups/cups.h
+common.64.o: common.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h
+common.64.o: common.c ../cups/array.h ../cups/file.h ../cups/language.h
+common.64.o: common.c ../cups/language.h
pdftops.64.o: pdftops.c ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/versioning.h
pdftops.64.o: pdftops.c ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-pdftops.64.o: pdftops.c ../cups/string.h ../config.h ../cups/i18n.h ../cups/transcode.h
-pstext.64.o: pstext.c pstext.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-pstext.64.o: pstext.c ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-pstext.64.o: pstext.c ../cups/language.h ../cups/language.h ../cups/string.h ../config.h
-pstext.64.o: pstext.c ../cups/transcode.h ../cups/i18n.h ../cups/transcode.h
-pstops.64.o: pstops.c common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-pstops.64.o: pstops.c ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-pstops.64.o: pstops.c ../cups/language.h ../cups/language.h ../cups/string.h ../config.h
-pstops.64.o: pstops.c ../cups/file.h ../cups/array.h ../cups/i18n.h ../cups/transcode.h
+pstext.64.o: pstext.c pstext.h common.h ../cups/string-private.h ../config.h
+pstext.64.o: pstext.c ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/versioning.h
+pstext.64.o: pstext.c ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+pstext.64.o: pstext.c ../cups/language.h ../cups/transcode.h ../cups/language-private.h
+pstops.64.o: pstops.c common.h ../cups/string-private.h ../config.h ../cups/cups.h
+pstops.64.o: pstops.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h
+pstops.64.o: pstops.c ../cups/array.h ../cups/file.h ../cups/language.h
+pstops.64.o: pstops.c ../cups/language.h ../cups/file.h ../cups/array.h
+pstops.64.o: pstops.c ../cups/language-private.h ../cups/transcode.h
rasterbench.64.o: rasterbench.c ../config.h ../cups/raster.h ../cups/cups.h ../cups/ipp.h
rasterbench.64.o: rasterbench.c ../cups/http.h ../cups/versioning.h ../cups/ppd.h
rasterbench.64.o: rasterbench.c ../cups/array.h ../cups/file.h ../cups/language.h
rastertoepson.64.o: rastertoepson.c ../cups/cups.h ../cups/ipp.h ../cups/http.h
rastertoepson.64.o: rastertoepson.c ../cups/versioning.h ../cups/ppd.h ../cups/array.h
rastertoepson.64.o: rastertoepson.c ../cups/file.h ../cups/language.h ../cups/ppd.h
-rastertoepson.64.o: rastertoepson.c ../cups/string.h ../config.h ../cups/i18n.h
-rastertoepson.64.o: rastertoepson.c ../cups/transcode.h ../cups/raster.h
+rastertoepson.64.o: rastertoepson.c ../cups/string-private.h ../config.h
+rastertoepson.64.o: rastertoepson.c ../cups/language-private.h ../cups/transcode.h
+rastertoepson.64.o: rastertoepson.c ../cups/raster.h
rastertohp.64.o: rastertohp.c ../cups/cups.h ../cups/ipp.h ../cups/http.h
rastertohp.64.o: rastertohp.c ../cups/versioning.h ../cups/ppd.h ../cups/array.h
-rastertohp.64.o: rastertohp.c ../cups/file.h ../cups/language.h ../cups/string.h ../config.h
-rastertohp.64.o: rastertohp.c ../cups/i18n.h ../cups/transcode.h ../cups/raster.h
+rastertohp.64.o: rastertohp.c ../cups/file.h ../cups/language.h ../cups/string-private.h
+rastertohp.64.o: rastertohp.c ../config.h ../cups/language-private.h ../cups/transcode.h
+rastertohp.64.o: rastertohp.c ../cups/raster.h
rastertolabel.64.o: rastertolabel.c ../cups/cups.h ../cups/ipp.h ../cups/http.h
rastertolabel.64.o: rastertolabel.c ../cups/versioning.h ../cups/ppd.h ../cups/array.h
-rastertolabel.64.o: rastertolabel.c ../cups/file.h ../cups/language.h ../cups/string.h
-rastertolabel.64.o: rastertolabel.c ../config.h ../cups/i18n.h ../cups/transcode.h
+rastertolabel.64.o: rastertolabel.c ../cups/file.h ../cups/language.h ../cups/string-private.h
+rastertolabel.64.o: rastertolabel.c ../config.h ../cups/language-private.h ../cups/transcode.h
rastertolabel.64.o: rastertolabel.c ../cups/raster.h
testimage.64.o: testimage.c image.h ../cups/raster.h ../cups/cups.h ../cups/ipp.h
testimage.64.o: testimage.c ../cups/http.h ../cups/versioning.h ../cups/ppd.h
@@ -402,13 +426,13 @@ testimage.64.o: testimage.c ../cups/array.h ../cups/file.h ../cups/language.h
testraster.64.o: testraster.c image-private.h image.h ../cups/raster.h ../cups/cups.h
testraster.64.o: testraster.c ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h
testraster.64.o: testraster.c ../cups/array.h ../cups/file.h ../cups/language.h
-testraster.64.o: testraster.c ../cups/debug.h ../cups/string.h ../config.h
-textcommon.64.o: textcommon.c textcommon.h common.h ../cups/cups.h ../cups/ipp.h
-textcommon.64.o: textcommon.c ../cups/http.h ../cups/versioning.h ../cups/ppd.h
-textcommon.64.o: textcommon.c ../cups/array.h ../cups/file.h ../cups/language.h
-textcommon.64.o: textcommon.c ../cups/language.h ../cups/string.h ../config.h ../cups/i18n.h
-textcommon.64.o: textcommon.c ../cups/transcode.h
-texttops.64.o: texttops.c textcommon.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-texttops.64.o: texttops.c ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-texttops.64.o: texttops.c ../cups/language.h ../cups/language.h ../cups/string.h
-texttops.64.o: texttops.c ../config.h ../cups/i18n.h ../cups/transcode.h
+testraster.64.o: testraster.c ../cups/debug-private.h ../cups/string-private.h ../config.h
+textcommon.64.o: textcommon.c textcommon.h common.h ../cups/string-private.h ../config.h
+textcommon.64.o: textcommon.c ../cups/cups.h ../cups/ipp.h ../cups/http.h
+textcommon.64.o: textcommon.c ../cups/versioning.h ../cups/ppd.h ../cups/array.h
+textcommon.64.o: textcommon.c ../cups/file.h ../cups/language.h ../cups/language.h
+textcommon.64.o: textcommon.c ../cups/language-private.h ../cups/transcode.h
+texttops.64.o: texttops.c textcommon.h common.h ../cups/string-private.h ../config.h
+texttops.64.o: texttops.c ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/versioning.h
+texttops.64.o: texttops.c ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+texttops.64.o: texttops.c ../cups/language.h ../cups/language-private.h ../cups/transcode.h
diff --git a/filter/bannertops.c b/filter/bannertops.c
index 814d23ad6..7f0e4aca2 100644
--- a/filter/bannertops.c
+++ b/filter/bannertops.c
@@ -1,9 +1,9 @@
/*
* "$Id$"
*
- * Banner to PostScript filter for the Common UNIX Printing System (CUPS).
+ * Banner to PostScript filter 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
@@ -29,7 +29,7 @@
#include "pstext.h"
#include "image.h"
-#include
+#include
/*
diff --git a/filter/commandtops.c b/filter/commandtops.c
index 2d0d3e45e..ebbf13732 100644
--- a/filter/commandtops.c
+++ b/filter/commandtops.c
@@ -3,7 +3,7 @@
*
* PostScript command filter 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
@@ -28,7 +28,7 @@
*/
#include
-#include
+#include
#include
diff --git a/filter/common.h b/filter/common.h
index fff618177..dabf75152 100644
--- a/filter/common.h
+++ b/filter/common.h
@@ -1,9 +1,9 @@
/*
* "$Id: common.h 6649 2007-07-11 21:46:42Z mike $"
*
- * Common filter definitions for the Common UNIX Printing System (CUPS).
+ * Common filter definitions for CUPS.
*
- * Copyright 2007 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
@@ -19,16 +19,10 @@
* Include necessary headers...
*/
-#include
-#include
-#include
-#include
-#include
-#include
-
+#include
#include
#include
-#include
+#include
/*
diff --git a/filter/gziptoany.c b/filter/gziptoany.c
index 0c9e7938d..8929d5f29 100644
--- a/filter/gziptoany.c
+++ b/filter/gziptoany.c
@@ -1,9 +1,9 @@
/*
* "$Id: gziptoany.c 6649 2007-07-11 21:46:42Z mike $"
*
- * GZIP/raw pre-filter for the Common UNIX Printing System (CUPS).
+ * GZIP/raw pre-filter for CUPS.
*
- * Copyright 2007 by Apple Inc.
+ * Copyright 2007-2010 by Apple Inc.
* Copyright 1993-2007 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
@@ -23,11 +23,7 @@
* Include necessary headers...
*/
-#include
-#include
-#include
-#include
-#include
+#include
/*
diff --git a/filter/image-private.h b/filter/image-private.h
index 0950cba0b..2264cf1f7 100644
--- a/filter/image-private.h
+++ b/filter/image-private.h
@@ -1,10 +1,9 @@
/*
* "$Id: image-private.h 7473 2008-04-21 17:51:58Z mike $"
*
- * Private image library definitions for the Common UNIX Printing
- * System (CUPS).
+ * Private image library definitions for CUPS.
*
- * Copyright 2007-2008 by Apple Inc.
+ * Copyright 2007-2010 by Apple Inc.
* Copyright 1993-2006 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
@@ -25,8 +24,8 @@
# include "image.h"
# include
-# include
-# include
+# include
+# include
# include
# include
# ifdef WIN32
diff --git a/filter/interpret.c b/filter/interpret.c
index ddbceda15..035de19fd 100644
--- a/filter/interpret.c
+++ b/filter/interpret.c
@@ -1,9 +1,9 @@
/*
* "$Id: interpret.c 7852 2008-08-21 04:19:45Z mike $"
*
- * PPD command interpreter for the Common UNIX Printing System (CUPS).
+ * PPD command interpreter for CUPS.
*
- * Copyright 2007-2008 by Apple Inc.
+ * Copyright 2007-2010 by Apple Inc.
* Copyright 1993-2007 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
@@ -40,9 +40,7 @@
* Include necessary headers...
*/
-#include
#include "image-private.h"
-#include
/*
diff --git a/filter/pstext.c b/filter/pstext.c
index 1517a608b..3ca28456c 100644
--- a/filter/pstext.c
+++ b/filter/pstext.c
@@ -1,9 +1,9 @@
/*
* "$Id$"
*
- * Common PostScript text code for the Common UNIX Printing System (CUPS).
+ * Common PostScript text code 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
@@ -27,7 +27,7 @@
*/
#include "pstext.h"
-#include
+#include
/*
diff --git a/filter/pstext.h b/filter/pstext.h
index fea5b0a75..41cbee433 100644
--- a/filter/pstext.h
+++ b/filter/pstext.h
@@ -1,10 +1,9 @@
/*
* "$Id$"
*
- * Common PostScript text definitions for the Common UNIX Printing System
- * (CUPS).
+ * Common PostScript text definitions 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
diff --git a/filter/pstops.c b/filter/pstops.c
index 2dbbabb95..6ed7bd044 100644
--- a/filter/pstops.c
+++ b/filter/pstops.c
@@ -1,7 +1,7 @@
/*
* "$Id: pstops.c 7977 2008-09-23 23:44:33Z mike $"
*
- * PostScript filter for the Common UNIX Printing System (CUPS).
+ * PostScript filter for CUPS.
*
* Copyright 2007-2010 by Apple Inc.
* Copyright 1993-2007 by Easy Software Products.
@@ -57,7 +57,7 @@
#include
#include
#include
-#include
+#include
#include
diff --git a/filter/raster.c b/filter/raster.c
index c19db7256..dedc30325 100644
--- a/filter/raster.c
+++ b/filter/raster.c
@@ -45,11 +45,6 @@
*/
#include "image-private.h"
-#include
-#include
-#include
-#include
-
#if defined(WIN32) || defined(__EMX__)
# include
#else
diff --git a/filter/rastertoepson.c b/filter/rastertoepson.c
index 9acde56da..e1d08ac30 100644
--- a/filter/rastertoepson.c
+++ b/filter/rastertoepson.c
@@ -1,10 +1,9 @@
/*
* "$Id: rastertoepson.c 7450 2008-04-14 19:39:02Z mike $"
*
- * EPSON ESC/P and ESC/P2 filter for the Common UNIX Printing System
- * (CUPS).
+ * EPSON ESC/P and ESC/P2 filter for CUPS.
*
- * Copyright 2007-2009 by Apple Inc.
+ * Copyright 2007-2010 by Apple Inc.
* Copyright 1993-2007 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
@@ -32,14 +31,12 @@
#include
#include
-#include
-#include
+#include
+#include
#include
-#include
#include
#include
#include
-#include
/*
diff --git a/filter/rastertohp.c b/filter/rastertohp.c
index 398a484e6..1192d7848 100644
--- a/filter/rastertohp.c
+++ b/filter/rastertohp.c
@@ -1,10 +1,9 @@
/*
* "$Id: rastertohp.c 7834 2008-08-04 21:02:09Z mike $"
*
- * Hewlett-Packard Page Control Language filter for the Common UNIX
- * Printing System (CUPS).
+ * Hewlett-Packard Page Control Language filter for CUPS.
*
- * Copyright 2007-2009 by Apple Inc.
+ * Copyright 2007-2010 by Apple Inc.
* Copyright 1993-2007 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
@@ -32,14 +31,12 @@
*/
#include
-#include
-#include
+#include
+#include
#include
-#include
#include
#include
#include