diff --git a/src/modules/CommonLog/clf.c b/src/modules/CommonLog/clf.c
index f7bb1774ecc1e7b7b45d53cafa741053eb2907cb..2106da4a15aa7af30bffcc7d80bca6e381eb1959 100644
--- a/src/modules/CommonLog/clf.c
+++ b/src/modules/CommonLog/clf.c
@@ -2,16 +2,14 @@
 || This file is part of Pike. For copyright information see COPYRIGHT.
 || Pike is distributed under GPL, LGPL and MPL. See the file COPYING
 || for more information.
-|| $Id: clf.c,v 1.14 2003/11/20 16:04:38 nilsson Exp $
+|| $Id: clf.c,v 1.15 2004/03/05 23:03:26 nilsson Exp $
 */
 
 /* MUST BE FIRST */
 #include "global.h"
-RCSID("$Id: clf.c,v 1.14 2003/11/20 16:04:38 nilsson Exp $");
+RCSID("$Id: clf.c,v 1.15 2004/03/05 23:03:26 nilsson Exp $");
 #include "fdlib.h"
 #include "stralloc.h"
-#include "pike_macros.h"
-#include "object.h"
 #include "program.h"
 #include "interpret.h"
 #include "builtin_functions.h"
diff --git a/src/modules/Image/blit.c b/src/modules/Image/blit.c
index 3f65671f9923093cf1fa3ccc1c1b20d2ce7370ab..f0628297d3d38b59fefd4c96c1b035196716f0e7 100644
--- a/src/modules/Image/blit.c
+++ b/src/modules/Image/blit.c
@@ -2,7 +2,7 @@
 || This file is part of Pike. For copyright information see COPYRIGHT.
 || Pike is distributed under GPL, LGPL and MPL. See the file COPYING
 || for more information.
-|| $Id: blit.c,v 1.55 2003/03/31 14:40:57 grubba Exp $
+|| $Id: blit.c,v 1.56 2004/03/05 23:04:02 nilsson Exp $
 */
 
 #include "global.h"
@@ -15,25 +15,16 @@
 #include <math.h>
 #include <ctype.h>
 
-#include "stralloc.h"
 #include "global.h"
 #include "pike_macros.h"
-#include "object.h"
-#include "constants.h"
 #include "interpret.h"
 #include "svalue.h"
-#include "array.h"
 #include "pike_error.h"
 #include "threads.h"
 
 #include "image.h"
 #include "image_machine.h"
 
-#ifdef ASSEMBLY_OK
-#include "assembly.h"
-#endif
-
-
 #define sp Pike_sp
 
 extern struct program *image_program;
diff --git a/src/modules/Image/colors.c b/src/modules/Image/colors.c
index d31259343128706c901ed2748d89f0b242dd881d..4bd6fb75af94ebf32e57b14e5a3357d436c04c8b 100644
--- a/src/modules/Image/colors.c
+++ b/src/modules/Image/colors.c
@@ -2,7 +2,7 @@
 || This file is part of Pike. For copyright information see COPYRIGHT.
 || Pike is distributed under GPL, LGPL and MPL. See the file COPYING
 || for more information.
-|| $Id: colors.c,v 1.71 2004/01/22 23:10:37 nilsson Exp $
+|| $Id: colors.c,v 1.72 2004/03/05 23:04:02 nilsson Exp $
 */
 
 /*
@@ -191,7 +191,7 @@
 
 #include "global.h"
 
-RCSID("$Id: colors.c,v 1.71 2004/01/22 23:10:37 nilsson Exp $");
+RCSID("$Id: colors.c,v 1.72 2004/03/05 23:04:02 nilsson Exp $");
 
 #include "image_machine.h"
 
@@ -200,12 +200,10 @@ RCSID("$Id: colors.c,v 1.71 2004/01/22 23:10:37 nilsson Exp $");
 #include "stralloc.h"
 #include "pike_macros.h"
 #include "object.h"
-#include "constants.h"
 #include "interpret.h"
 #include "svalue.h"
 #include "array.h"
 #include "mapping.h"
-#include "threads.h"
 #include "builtin_functions.h"
 #include "dmalloc.h"
 #include "operators.h"
diff --git a/src/modules/Image/colortable.c b/src/modules/Image/colortable.c
index ad76162d2208bdf7f0e9348b8dd6793d702edf73..47f7848f20b9585e3f6c1f566216cf4444205bac 100644
--- a/src/modules/Image/colortable.c
+++ b/src/modules/Image/colortable.c
@@ -2,7 +2,7 @@
 || This file is part of Pike. For copyright information see COPYRIGHT.
 || Pike is distributed under GPL, LGPL and MPL. See the file COPYING
 || for more information.
-|| $Id: colortable.c,v 1.118 2004/01/22 23:10:52 nilsson Exp $
+|| $Id: colortable.c,v 1.119 2004/03/05 23:04:02 nilsson Exp $
 */
 
 #include "global.h"
@@ -24,7 +24,7 @@
 /* #define COLORTABLE_REDUCE_DEBUG */
 /* #define CUBICLE_DEBUG */
 
-RCSID("$Id: colortable.c,v 1.118 2004/01/22 23:10:52 nilsson Exp $");
+RCSID("$Id: colortable.c,v 1.119 2004/03/05 23:04:02 nilsson Exp $");
 
 #include <math.h> /* fabs() */
 
@@ -33,12 +33,9 @@ RCSID("$Id: colortable.c,v 1.118 2004/01/22 23:10:52 nilsson Exp $");
 #include "stralloc.h"
 #include "pike_macros.h"
 #include "object.h"
-#include "constants.h"
 #include "interpret.h"
 #include "svalue.h"
-#include "array.h"
 #include "mapping.h"
-#include "threads.h"
 #include "builtin_functions.h"
 #include "pike_error.h"
 #include "module_support.h"
diff --git a/src/modules/Image/dct.c b/src/modules/Image/dct.c
index 517ba6b5b6f202f00fdb1687b22a943e6c11eab3..3530cf31ed6703e6039869fb312e27dc44b3ad92 100644
--- a/src/modules/Image/dct.c
+++ b/src/modules/Image/dct.c
@@ -2,7 +2,7 @@
 || This file is part of Pike. For copyright information see COPYRIGHT.
 || Pike is distributed under GPL, LGPL and MPL. See the file COPYING
 || for more information.
-|| $Id: dct.c,v 1.24 2003/08/20 22:26:32 nilsson Exp $
+|| $Id: dct.c,v 1.25 2004/03/05 23:04:02 nilsson Exp $
 */
 
 /*
@@ -15,14 +15,11 @@
 #include <math.h>
 #include <ctype.h>
 
-#include "stralloc.h"
 #include "global.h"
 #include "pike_macros.h"
 #include "object.h"
-#include "constants.h"
 #include "interpret.h"
 #include "svalue.h"
-#include "array.h"
 #include "pike_error.h"
 
 #include "image.h"
diff --git a/src/modules/Image/default_font.c b/src/modules/Image/default_font.c
index 34174fc2115ac77c430dd1cb631d33ad6b7a340b..00bd42ccb314764d314015285d5a23c48bd935df 100644
--- a/src/modules/Image/default_font.c
+++ b/src/modules/Image/default_font.c
@@ -2,11 +2,9 @@
 || This file is part of Pike. For copyright information see COPYRIGHT.
 || Pike is distributed under GPL, LGPL and MPL. See the file COPYING
 || for more information.
-|| $Id: default_font.c,v 1.7 2003/02/21 12:01:07 grubba Exp $
+|| $Id: default_font.c,v 1.8 2004/03/05 23:04:02 nilsson Exp $
 */
 
-#include "global.h"
-
 /* Use cpp to RLE-encode... */
 #define Z4	0,0,0,0
 #define Z8	Z4,Z4
diff --git a/src/modules/Image/font.c b/src/modules/Image/font.c
index 6a4d3a5d69e4cb019d559862d8382dd4b1224c0d..7f688c544101120b6d1ce252fc2e1a27815ad403 100644
--- a/src/modules/Image/font.c
+++ b/src/modules/Image/font.c
@@ -2,7 +2,7 @@
 || This file is part of Pike. For copyright information see COPYRIGHT.
 || Pike is distributed under GPL, LGPL and MPL. See the file COPYING
 || for more information.
-|| $Id: font.c,v 1.82 2003/10/07 16:21:01 mast Exp $
+|| $Id: font.c,v 1.83 2004/03/05 23:04:02 nilsson Exp $
 */
 
 #include "global.h"
@@ -119,12 +119,9 @@ extern const unsigned char image_default_font[];
 #include <errno.h>
 
 #include "stralloc.h"
-#include "pike_macros.h"
 #include "object.h"
-#include "constants.h"
 #include "interpret.h"
 #include "svalue.h"
-#include "array.h"
 #include "threads.h"
 #include "builtin_functions.h"
 
diff --git a/src/modules/Image/image.c b/src/modules/Image/image.c
index d43226c68af1930d1704f4ed977946c54b148bcd..93e750cd43367566206c9532d9559fc1aa6f6a80 100644
--- a/src/modules/Image/image.c
+++ b/src/modules/Image/image.c
@@ -2,7 +2,7 @@
 || This file is part of Pike. For copyright information see COPYRIGHT.
 || Pike is distributed under GPL, LGPL and MPL. See the file COPYING
 || for more information.
-|| $Id: image.c,v 1.208 2003/12/01 18:12:24 nilsson Exp $
+|| $Id: image.c,v 1.209 2004/03/05 23:04:02 nilsson Exp $
 */
 
 /*
@@ -101,16 +101,14 @@
 
 #include "stralloc.h"
 #include "global.h"
-RCSID("$Id: image.c,v 1.208 2003/12/01 18:12:24 nilsson Exp $");
+RCSID("$Id: image.c,v 1.209 2004/03/05 23:04:02 nilsson Exp $");
 #include "pike_macros.h"
 #include "object.h"
-#include "constants.h"
 #include "interpret.h"
 #include "svalue.h"
 #include "threads.h"
 #include "array.h"
 #include "pike_error.h"
-#include "operators.h"
 #include "module_support.h"
 
 
diff --git a/src/modules/Image/layers.c b/src/modules/Image/layers.c
index a56c06b75e7b858d49429894e5119df0d88c803a..ad60ed7ff955bac1a7bb5c18c80f23994e998c30 100644
--- a/src/modules/Image/layers.c
+++ b/src/modules/Image/layers.c
@@ -2,7 +2,7 @@
 || This file is part of Pike. For copyright information see COPYRIGHT.
 || Pike is distributed under GPL, LGPL and MPL. See the file COPYING
 || for more information.
-|| $Id: layers.c,v 1.95 2004/02/03 17:34:38 grubba Exp $
+|| $Id: layers.c,v 1.96 2004/03/05 23:04:03 nilsson Exp $
 */
 
 /*
@@ -15,14 +15,13 @@
 
 #include <math.h> /* floor */
 
-RCSID("$Id: layers.c,v 1.95 2004/02/03 17:34:38 grubba Exp $");
+RCSID("$Id: layers.c,v 1.96 2004/03/05 23:04:03 nilsson Exp $");
 
 #include "image_machine.h"
 
 #include "stralloc.h"
 #include "pike_macros.h"
 #include "object.h"
-#include "constants.h"
 #include "interpret.h"
 #include "svalue.h"
 #include "array.h"
diff --git a/src/modules/Image/matrix.c b/src/modules/Image/matrix.c
index 3850a294c13342a2a37a57cbae228ca186617c4a..c3a24978513849b4766f1776c9054b856375bfe2 100644
--- a/src/modules/Image/matrix.c
+++ b/src/modules/Image/matrix.c
@@ -2,7 +2,7 @@
 || This file is part of Pike. For copyright information see COPYRIGHT.
 || Pike is distributed under GPL, LGPL and MPL. See the file COPYING
 || for more information.
-|| $Id: matrix.c,v 1.47 2003/08/13 09:10:09 grubba Exp $
+|| $Id: matrix.c,v 1.48 2004/03/05 23:04:03 nilsson Exp $
 */
 
 /*
@@ -15,14 +15,10 @@
 #include <math.h>
 #include <ctype.h>
 
-#include "stralloc.h"
-#include "global.h"
 #include "pike_macros.h"
 #include "object.h"
-#include "constants.h"
 #include "interpret.h"
 #include "svalue.h"
-#include "array.h"
 #include "threads.h"
 #include "pike_error.h"
 
diff --git a/src/modules/Image/operator.c b/src/modules/Image/operator.c
index b5b3e99c3a7cc3680f642a4f52b17a2cbf94c6ab..5a1128105425449f23e0778283283837c4c4f23f 100644
--- a/src/modules/Image/operator.c
+++ b/src/modules/Image/operator.c
@@ -2,7 +2,7 @@
 || This file is part of Pike. For copyright information see COPYRIGHT.
 || Pike is distributed under GPL, LGPL and MPL. See the file COPYING
 || for more information.
-|| $Id: operator.c,v 1.45 2004/01/22 23:11:58 nilsson Exp $
+|| $Id: operator.c,v 1.46 2004/03/05 23:04:03 nilsson Exp $
 */
 
 /*
@@ -15,14 +15,10 @@
 #include <math.h>
 #include <ctype.h>
 
-#include "stralloc.h"
-#include "global.h"
 #include "pike_macros.h"
 #include "object.h"
-#include "constants.h"
 #include "interpret.h"
 #include "svalue.h"
-#include "array.h"
 #include "pike_error.h"
 #include "threads.h"
 #include "builtin_functions.h"
diff --git a/src/modules/Image/orient.c b/src/modules/Image/orient.c
index 234017d4a2e2c552076f6154b208307856671b60..41f90c51f0532cfa3691ef6a93ff2da4a00b38b3 100644
--- a/src/modules/Image/orient.c
+++ b/src/modules/Image/orient.c
@@ -2,7 +2,7 @@
 || This file is part of Pike. For copyright information see COPYRIGHT.
 || Pike is distributed under GPL, LGPL and MPL. See the file COPYING
 || for more information.
-|| $Id: orient.c,v 1.24 2003/03/14 15:57:48 grubba Exp $
+|| $Id: orient.c,v 1.25 2004/03/05 23:04:03 nilsson Exp $
 */
 
 /*
@@ -15,15 +15,11 @@
 #include <math.h>
 #include <ctype.h>
 
-#include "stralloc.h"
-#include "global.h"
 #include "pike_macros.h"
 #include "object.h"
-#include "constants.h"
 #include "interpret.h"
 #include "svalue.h"
 #include "threads.h"
-#include "array.h"
 #include "pike_error.h"
 
 #include "image.h"
diff --git a/src/modules/Image/pattern.c b/src/modules/Image/pattern.c
index 773795f3e8abf494b93892b8d7c6fca97b99f1d6..7b4eff31f4bb3eb576ec60b80c81bd1c5d34da39 100644
--- a/src/modules/Image/pattern.c
+++ b/src/modules/Image/pattern.c
@@ -2,7 +2,7 @@
 || This file is part of Pike. For copyright information see COPYRIGHT.
 || Pike is distributed under GPL, LGPL and MPL. See the file COPYING
 || for more information.
-|| $Id: pattern.c,v 1.28 2002/10/21 17:06:14 marcus Exp $
+|| $Id: pattern.c,v 1.29 2004/03/05 23:04:03 nilsson Exp $
 */
 
 /*
@@ -15,14 +15,10 @@
 #include <math.h>
 #include <ctype.h>
 
-#include "stralloc.h"
-#include "global.h"
 #include "pike_macros.h"
 #include "object.h"
-#include "constants.h"
 #include "interpret.h"
 #include "svalue.h"
-#include "array.h"
 #include "pike_error.h"
 #include "threads.h"
 #include "builtin_functions.h"
diff --git a/src/modules/Image/polyfill.c b/src/modules/Image/polyfill.c
index 75b8ed4cb9ec85a3c154f9a26788584c8346def9..d081e16dbbe83547ee70e1f0d659084030ef2db7 100644
--- a/src/modules/Image/polyfill.c
+++ b/src/modules/Image/polyfill.c
@@ -2,17 +2,15 @@
 || This file is part of Pike. For copyright information see COPYRIGHT.
 || Pike is distributed under GPL, LGPL and MPL. See the file COPYING
 || for more information.
-|| $Id: polyfill.c,v 1.44 2003/11/03 16:23:20 nilsson Exp $
+|| $Id: polyfill.c,v 1.45 2004/03/05 23:04:03 nilsson Exp $
 */
 
 #include "global.h"
-RCSID("$Id: polyfill.c,v 1.44 2003/11/03 16:23:20 nilsson Exp $");
+RCSID("$Id: polyfill.c,v 1.45 2004/03/05 23:04:03 nilsson Exp $");
 
 /* Prototypes are needed for these */
 extern double floor(double);
 
-#include "global.h"
-
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
@@ -21,15 +19,9 @@ extern double floor(double);
 
 #include "image_machine.h"
 
-#include "stralloc.h"
-#include "pike_macros.h"
-#include "object.h"
-#include "constants.h"
 #include "interpret.h"
 #include "svalue.h"
-#include "array.h"
 #include "threads.h"
-#include "builtin_functions.h"
 
 #include "image.h"
 
diff --git a/src/modules/Image/search.c b/src/modules/Image/search.c
index aca21efc847e1745e62cd0bed5f7a21484db8743..fd7298c5d59d24497a1ab22666e09dba5deed9ef 100644
--- a/src/modules/Image/search.c
+++ b/src/modules/Image/search.c
@@ -2,7 +2,7 @@
 || This file is part of Pike. For copyright information see COPYRIGHT.
 || Pike is distributed under GPL, LGPL and MPL. See the file COPYING
 || for more information.
-|| $Id: search.c,v 1.26 2002/10/21 17:06:14 marcus Exp $
+|| $Id: search.c,v 1.27 2004/03/05 23:04:03 nilsson Exp $
 */
 
 /*
@@ -18,18 +18,13 @@
 #include "global.h"
 #include "pike_macros.h"
 #include "object.h"
-#include "constants.h"
 #include "interpret.h"
 #include "svalue.h"
 #include "threads.h"
-#include "array.h"
 #include "pike_error.h"
-#include "builtin_functions.h"
 
 #include "image.h"
 
-#include <builtin_functions.h>
-
 
 #define sp Pike_sp