diff --git a/src/modules/Image/Makefile b/src/modules/Image/Makefile
index 567c6a14991a60e092111324232f7cff27f9e2b5..a7e7b6acfc4c2fde5d9d17ca712b03f7401d4ce7 100644
--- a/src/modules/Image/Makefile
+++ b/src/modules/Image/Makefile
@@ -1,54 +1,56 @@
-# $Id: Makefile,v 1.16 1999/04/12 11:44:29 mirar Exp $
+# $Id: Makefile,v 1.17 1999/05/28 14:24:11 mirar Exp $
+
+# grep -l '**!' {,../_Image*/}**/*.{c,h}  
 
 DOCFILES = doc-header            \
-	image.c								\
-	../_Image_JPEG/acconfig.h					\
-	../_Image_JPEG/image_jpeg.c					\
-	../_Image_TIFF/acconfig.h					\
-	../_Image_TIFF/image_tiff.c					\
-	../_Image_TTF/acconfig.h					\
-	../_Image_TTF/image_ttf.c					\
-	../_Image_XFace/acconfig.h					\
-	../_Image_XFace/image_xface.c					\
-	acconfig.h							\
-	blit.c								\
-	blit_layer_include.h						\
-	colors.c							\
-	colors.h							\
-	colortable.c							\
-	colortable.h							\
-	colortable_lookup.h						\
-	dct.c								\
-	encodings/_xpm.c						\
-	encodings/any.c							\
-	encodings/bmp.c							\
-	encodings/gif.c							\
-	encodings/gif_lzw.c						\
-	encodings/gif_lzw.h						\
-	encodings/iff.c							\
-	encodings/ilbm.c						\
-	encodings/pcx.c							\
-	encodings/png.c							\
-	encodings/pnm.c							\
-	encodings/tga.c							\
-	encodings/x.c							\
-	encodings/xbm.c							\
-	encodings/xcf.c							\
-	encodings/xcf_constant_strings.h				\
-	encodings/xwd.c							\
-	font.c								\
-	image.h								\
-	match.h								\
-	matrix.c							\
-	operator.c							\
-	orient.c							\
-	pattern.c							\
-	phase.h								\
-	pnm_compat.c							\
-	polyfill.c							\
-	search.c							\
-	togif.c								\
-	x.c \
+	blit.c					\
+	colors.c				\
+	colortable.c				\
+	dct.c					\
+	default_font.c				\
+	encodings/_xpm.c			\
+	encodings/any.c				\
+	encodings/avs.c				\
+	encodings/bmp.c				\
+	encodings/gd.c				\
+	encodings/gif.c				\
+	encodings/gif_lzw.c			\
+	encodings/hrz.c				\
+	encodings/iff.c				\
+	encodings/ilbm.c			\
+	encodings/pcx.c				\
+	encodings/png.c				\
+	encodings/pnm.c				\
+	encodings/psd.c				\
+	encodings/tga.c				\
+	encodings/x.c				\
+	encodings/xbm.c				\
+	encodings/xcf.c				\
+	encodings/xwd.c				\
+	font.c					\
+	image.c					\
+	image_module.c				\
+	layers.c				\
+	matrix.c				\
+	operator.c				\
+	orient.c				\
+	pattern.c				\
+	polyfill.c				\
+	search.c				\
+	x.c					\
+	blit_layer_include.h			\
+	colortable.h				\
+	colortable_lookup.h			\
+	encodings/gif_lzw.h			\
+	image.h					\
+	layer_channel.h				\
+	layer_oper.h				\
+	match.h					\
+	phase.h					\
+	../_Image_JPEG/image_jpeg.c		\
+	../_Image_TIFF/image_tiff.c		\
+	../_Image_TTF/image_ttf.c		\
+	../_Image_XFace/image_xface.c		\
 	doc-footer                     
 
 WMMLDOCPLACE = ../../../tutorial/Image.wmml
diff --git a/src/modules/Image/doc-header b/src/modules/Image/doc-header
index 5d6973a1c672c021790116667ccdf36015f781c2..c852d2547e7e2a835d0c9e5ed3c001b667ebe1fe 100644
--- a/src/modules/Image/doc-header
+++ b/src/modules/Image/doc-header
@@ -62,3 +62,18 @@
 **!	</table>
 **! note
 **!	<font size=-1><pre>Image module documentation is based on these file versions:
+**!
+**! module Image
+**! class Image
+**! class Colortable
+**! class Layer
+**! class Font
+**!
+**! module Image
+**! submodule Color
+**!
+**! module Image
+**! submodule X
+**!
+**! module Image
+**! submodule ANY