diff --git a/src/modules/Image/acconfig.h b/src/modules/Image/acconfig.h
index 39d90cbd7a4b8eb4fa994ffe8a9afbb4bac64ca1..8eb4464af36b180f84f79b0e7a9e3dec9efd3cf2 100644
--- a/src/modules/Image/acconfig.h
+++ b/src/modules/Image/acconfig.h
@@ -1,10 +1,13 @@
 /*
- * $Id: acconfig.h,v 1.1 1997/05/22 16:15:40 grubba Exp $
+ * $Id: acconfig.h,v 1.2 1999/05/30 20:11:51 mirar Exp $
  */
 
 #ifndef IMAGE_MACHINE_H
 #define IMAGE_MACHINE_H
 
+/* define if you want lzw code to generate only rle packing */
+#undef GIF_LZW_RLE
+
 @TOP@
 @BOTTOM@
 
diff --git a/src/modules/Image/colors.c b/src/modules/Image/colors.c
index d208f7d64673c12a663317d08a1ba7023a923122..56f15699c03e6a07927323aa6672a3ee983a870f 100644
--- a/src/modules/Image/colors.c
+++ b/src/modules/Image/colors.c
@@ -1,7 +1,7 @@
 /*
 **! module Image
 **! note
-**!	$Id: colors.c,v 1.19 1999/05/24 13:01:28 mirar Exp $
+**!	$Id: colors.c,v 1.20 1999/05/30 20:11:53 mirar Exp $
 **! submodule Color
 **!
 **!	This module keeps names and easy handling 
@@ -95,11 +95,10 @@
 */
 
 #include "global.h"
-#include <config.h>
 
-RCSID("$Id: colors.c,v 1.19 1999/05/24 13:01:28 mirar Exp $");
+RCSID("$Id: colors.c,v 1.20 1999/05/30 20:11:53 mirar Exp $");
 
-#include "config.h"
+#include "image_machine.h"
 
 #include <math.h>
 
diff --git a/src/modules/Image/colortable.c b/src/modules/Image/colortable.c
index 8cc1463e68be15b25218ae3fc2d03b72c4952986..c57fcb1b24e1b58321df2a174797083e19eff777 100644
--- a/src/modules/Image/colortable.c
+++ b/src/modules/Image/colortable.c
@@ -1,12 +1,11 @@
 #include "global.h"
-#include <config.h>
 
-/* $Id: colortable.c,v 1.68 1999/05/24 13:02:05 mirar Exp $ */
+/* $Id: colortable.c,v 1.69 1999/05/30 20:11:54 mirar Exp $ */
 
 /*
 **! module Image
 **! note
-**!	$Id: colortable.c,v 1.68 1999/05/24 13:02:05 mirar Exp $
+**!	$Id: colortable.c,v 1.69 1999/05/30 20:11:54 mirar Exp $
 **! class Colortable
 **!
 **!	This object keeps colortable information,
@@ -21,11 +20,11 @@
 #undef COLORTABLE_DEBUG
 #undef COLORTABLE_REDUCE_DEBUG
 
-RCSID("$Id: colortable.c,v 1.68 1999/05/24 13:02:05 mirar Exp $");
+RCSID("$Id: colortable.c,v 1.69 1999/05/30 20:11:54 mirar Exp $");
 
 #include <math.h> /* fabs() */
 
-#include "config.h"
+#include "image_machine.h"
 
 #include "stralloc.h"
 #include "pike_macros.h"
diff --git a/src/modules/Image/encodings/_xpm.c b/src/modules/Image/encodings/_xpm.c
index b597e7252133876116a50d4f8db3e6054b35db82..6bba5843340fd8be17947ab6e60d96f47c8ac87c 100644
--- a/src/modules/Image/encodings/_xpm.c
+++ b/src/modules/Image/encodings/_xpm.c
@@ -1,7 +1,7 @@
 #include "global.h"
-RCSID("$Id: _xpm.c,v 1.7 1999/05/23 17:46:48 mirar Exp $");
+RCSID("$Id: _xpm.c,v 1.8 1999/05/30 20:12:02 mirar Exp $");
 
-#include "config.h"
+#include "image_machine.h"
 
 #include "interpret.h"
 #include "svalue.h"
diff --git a/src/modules/Image/encodings/avs.c b/src/modules/Image/encodings/avs.c
index e9a3634e4929ea5f0e06442a94341f2f46be0220..5c215f6d95a08295edc8ee14c5fa36401f85820c 100644
--- a/src/modules/Image/encodings/avs.c
+++ b/src/modules/Image/encodings/avs.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "config.h"
+#include "image_machine.h"
 #include <math.h>
 #include <ctype.h>
 
@@ -8,7 +8,7 @@
 #endif
 
 #include "stralloc.h"
-RCSID("$Id: avs.c,v 1.6 1999/05/23 17:46:50 mirar Exp $");
+RCSID("$Id: avs.c,v 1.7 1999/05/30 20:12:06 mirar Exp $");
 #include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
diff --git a/src/modules/Image/encodings/gd.c b/src/modules/Image/encodings/gd.c
index b422c5d42afa5e33c507d61fc7d2b05f31ffb7fb..929356ef71237061a3eb48068b0090b7758b1d38 100644
--- a/src/modules/Image/encodings/gd.c
+++ b/src/modules/Image/encodings/gd.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "config.h"
+#include "image_machine.h"
 #include <math.h>
 #include <ctype.h>
 
@@ -8,7 +8,7 @@
 #endif
 
 #include "stralloc.h"
-RCSID("$Id: gd.c,v 1.2 1999/05/24 13:04:45 mirar Exp $");
+RCSID("$Id: gd.c,v 1.3 1999/05/30 20:12:08 mirar Exp $");
 #include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
diff --git a/src/modules/Image/encodings/pcx.c b/src/modules/Image/encodings/pcx.c
index 8e6dc2b4aa472363a82a19f9d0707faaba2fb57f..a0b22df87a7680cca5ee675ff4fe3f7827c5f4aa 100644
--- a/src/modules/Image/encodings/pcx.c
+++ b/src/modules/Image/encodings/pcx.c
@@ -1,7 +1,7 @@
 #include "global.h"
-RCSID("$Id: pcx.c,v 1.7 1999/05/24 12:53:58 mirar Exp $");
+RCSID("$Id: pcx.c,v 1.8 1999/05/30 20:12:14 mirar Exp $");
 
-#include "config.h"
+#include "image_machine.h"
 
 #include "pike_macros.h"
 #include "object.h"
diff --git a/src/modules/Image/encodings/png.c b/src/modules/Image/encodings/png.c
index a0065507585dc374d22cded32eb7a6322f676d35..477113743b86b85067ac9f0ef72cf4b3009a8862 100644
--- a/src/modules/Image/encodings/png.c
+++ b/src/modules/Image/encodings/png.c
@@ -1,7 +1,7 @@
 #include "global.h"
-RCSID("$Id: png.c,v 1.24 1999/05/23 17:46:56 mirar Exp $");
+RCSID("$Id: png.c,v 1.25 1999/05/30 20:12:17 mirar Exp $");
 
-#include "config.h"
+#include "image_machine.h"
 
 #include "pike_macros.h"
 #include "object.h"
diff --git a/src/modules/Image/encodings/psd.c b/src/modules/Image/encodings/psd.c
index 8345fdf73d1a07b5896b5db7dde8089717c5d666..02dd2bf39552a456e4ecb9bc0ae36d32813be774 100644
--- a/src/modules/Image/encodings/psd.c
+++ b/src/modules/Image/encodings/psd.c
@@ -1,7 +1,7 @@
 #include "global.h"
-RCSID("$Id: psd.c,v 1.10 1999/05/23 17:46:59 mirar Exp $");
+RCSID("$Id: psd.c,v 1.11 1999/05/30 20:12:19 mirar Exp $");
 
-#include "config.h"
+#include "image_machine.h"
 
 #include "pike_macros.h"
 #include "object.h"
diff --git a/src/modules/Image/encodings/xbm.c b/src/modules/Image/encodings/xbm.c
index 46151716aad289da5397039745bfa929efc583a7..f35d310fb90a401e117bd11e696503928ab0849e 100644
--- a/src/modules/Image/encodings/xbm.c
+++ b/src/modules/Image/encodings/xbm.c
@@ -1,7 +1,7 @@
 #include "global.h"
-RCSID("$Id: xbm.c,v 1.5 1999/05/23 17:47:02 mirar Exp $");
+RCSID("$Id: xbm.c,v 1.6 1999/05/30 20:12:20 mirar Exp $");
 
-#include "config.h"
+#include "image_machine.h"
 
 #include "interpret.h"
 #include "svalue.h"
diff --git a/src/modules/Image/encodings/xcf.c b/src/modules/Image/encodings/xcf.c
index 99dbb5c5601fb5799db17e2f858f6f1fd42ae4b2..b27699cc89c41cc165cec7e92b6e9d7e79a70513 100644
--- a/src/modules/Image/encodings/xcf.c
+++ b/src/modules/Image/encodings/xcf.c
@@ -1,7 +1,7 @@
 #include "global.h"
-RCSID("$Id: xcf.c,v 1.8 1999/05/23 17:47:03 mirar Exp $");
+RCSID("$Id: xcf.c,v 1.9 1999/05/30 20:12:21 mirar Exp $");
 
-#include "config.h"
+#include "image_machine.h"
 
 #include "pike_macros.h"
 #include "object.h"
diff --git a/src/modules/Image/font.c b/src/modules/Image/font.c
index dd35b11a3515fb09bb6e14663ab10c2cb0434189..bb8ae163124b8730670dce20a963163458f929dc 100644
--- a/src/modules/Image/font.c
+++ b/src/modules/Image/font.c
@@ -1,6 +1,5 @@
-/* $Id: font.c,v 1.49 1999/05/24 14:33:10 mirar Exp $ */
+/* $Id: font.c,v 1.50 1999/05/30 20:11:56 mirar Exp $ */
 #include "global.h"
-#include <config.h>
 
 #define SPACE_CHAR 'i'
 
@@ -10,7 +9,7 @@ extern unsigned char * image_default_font;
 /*
 **! module Image
 **! note
-**!	$Id: font.c,v 1.49 1999/05/24 14:33:10 mirar Exp $
+**!	$Id: font.c,v 1.50 1999/05/30 20:11:56 mirar Exp $
 **! class Font
 **!
 **! note
@@ -166,7 +165,7 @@ Kerningtable types:
 
 #include <errno.h>
 
-#include "config.h"
+#include "image_machine.h"
 
 #include "stralloc.h"
 #include "pike_macros.h"
diff --git a/src/modules/Image/layers.c b/src/modules/Image/layers.c
index eaacd5a80160dbcd669d01c7e7560e7dcfb02de8..8de74f1cf8472641758fea4d9bcfee75b4aa47db 100644
--- a/src/modules/Image/layers.c
+++ b/src/modules/Image/layers.c
@@ -1,18 +1,17 @@
 /*
 **! module Image
 **! note
-**!	$Id: layers.c,v 1.13 1999/05/29 14:31:20 mirar Exp $
+**!	$Id: layers.c,v 1.14 1999/05/30 20:11:58 mirar Exp $
 **! class Layer
 */
 
 #include "global.h"
-#include <config.h>
 
 #include <math.h> /* floor */
 
-RCSID("$Id: layers.c,v 1.13 1999/05/29 14:31:20 mirar Exp $");
+RCSID("$Id: layers.c,v 1.14 1999/05/30 20:11:58 mirar Exp $");
 
-#include "config.h"
+#include "image_machine.h"
 
 #include "stralloc.h"
 #include "pike_macros.h"
diff --git a/src/modules/Image/operator.c b/src/modules/Image/operator.c
index 5f89dceb25e951f4e90d4cdd6b6e51139cd3c482..153d4809c3961ca06bfb54a5061ca09738844012 100644
--- a/src/modules/Image/operator.c
+++ b/src/modules/Image/operator.c
@@ -1,9 +1,9 @@
-/* $Id: operator.c,v 1.23 1999/05/02 08:00:15 hubbe Exp $ */
+/* $Id: operator.c,v 1.24 1999/05/30 20:11:59 mirar Exp $ */
 
 /*
 **! module Image
 **! note
-**!	$Id: operator.c,v 1.23 1999/05/02 08:00:15 hubbe Exp $
+**!	$Id: operator.c,v 1.24 1999/05/30 20:11:59 mirar Exp $
 **! class Image
 */
 
@@ -113,7 +113,7 @@ extern struct program *image_program;
 **!	to using an uniform-colored image.
 **! arg int value
 **!	equal to ({value,value,value}).
-**! see also: `+, `|, `&, `*, add_layers, min, max, `==
+**! see also: `+, `|, `&, `*, Image.Layer, min, max, `==
 */
 
 void image_operator_minus(INT32 args)
@@ -153,7 +153,7 @@ STANDARD_OPERATOR_HEADER("`-")
 **!	to using an uniform-colored image.
 **! arg int value
 **!	equal to ({value,value,value}).
-**! see also: `-, `|, `&, `*, add_layers
+**! see also: `-, `|, `&, `*, Image.Layer
 */
 
 void image_operator_plus(INT32 args)
@@ -200,7 +200,7 @@ STANDARD_OPERATOR_HEADER("`+")
 **! arg int value
 **!	equal to ({value,value,value}).
 **!
-**! see also: `-, `+, `|, `&, add_layers
+**! see also: `-, `+, `|, `&, Image.Layer
 */
 
 void image_operator_multiply(INT32 args)
@@ -246,7 +246,7 @@ STANDARD_OPERATOR_HEADER("`*")
 **!	if specified as color or value, it will act as a whole
 **!	image of that color (or value).
 **!
-**! see also: `-, `+, `|, `&, `*, add_layers
+**! see also: `-, `+, `|, `&, `*, Image.Layer
 **!
 **! note: Divide is really not a/b but a/((b+1)/255).
 **!	  It isn't possible to do a modulo 256 either. (why?)
@@ -317,7 +317,7 @@ STANDARD_OPERATOR_HEADER("`/")
 **!	to using an uniform-colored image.
 **! arg int value
 **!	equal to ({value,value,value}).
-**! see also: `-, `+, `&, `*, add_layers
+**! see also: `-, `+, `&, `*, Image.Layer
 */
 
 void image_operator_maximum(INT32 args)
@@ -359,7 +359,7 @@ STANDARD_OPERATOR_HEADER("`| 'maximum'")
 **!	to using an uniform-colored image.
 **! arg int value
 **!	equal to ({value,value,value}).
-**! see also: `-, `+, `|, `*, add_layers
+**! see also: `-, `+, `|, `*, Image.Layer
 */
 
 void image_operator_minimum(INT32 args)
diff --git a/src/modules/Image/polyfill.c b/src/modules/Image/polyfill.c
index 4b15659f9cc426cc1d5cafc3f987f3794f794995..1a77bd9891a73ce0843eac3de74645b254f45854 100644
--- a/src/modules/Image/polyfill.c
+++ b/src/modules/Image/polyfill.c
@@ -1,5 +1,5 @@
 #include "global.h"
-RCSID("$Id: polyfill.c,v 1.27 1999/04/13 12:32:33 mirar Exp $");
+RCSID("$Id: polyfill.c,v 1.28 1999/05/30 20:12:01 mirar Exp $");
 
 /* Prototypes are needed for these */
 extern double floor(double);
@@ -7,7 +7,7 @@ extern double floor(double);
 #include <unistd.h>
 #include <math.h>
 
-#include "config.h"
+#include "image_machine.h"
 
 #include "stralloc.h"
 #include "pike_macros.h"
@@ -32,7 +32,7 @@ extern double floor(double);
 /*
 **! module Image
 **! note
-**!	$Id: polyfill.c,v 1.27 1999/04/13 12:32:33 mirar Exp $
+**!	$Id: polyfill.c,v 1.28 1999/05/30 20:12:01 mirar Exp $
 **! class Image
 */