diff --git a/src/encode.c b/src/encode.c
index b581b83cf54b9778b363bdd65ecacb95ca45cff6..e87e966e74825b21b73f88927da5d98922bb7857 100644
--- a/src/encode.c
+++ b/src/encode.c
@@ -3,8 +3,8 @@
 ||| Pike is distributed as GPL (General Public License)
 ||| See the files COPYING and DISCLAIMER for more information.
 \*/
-#include "stralloc.h"
 #include "global.h"
+#include "stralloc.h"
 #include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
diff --git a/src/modules/Image/colortable.c b/src/modules/Image/colortable.c
index 86759d59cc07b8eb5f09931baf572efd3c64b643..8358675cbb49b219b543b1768e796b8ebc4cc499 100644
--- a/src/modules/Image/colortable.c
+++ b/src/modules/Image/colortable.c
@@ -1,11 +1,13 @@
-#include <config.h>
+/* $Id: colortable.c,v 1.31 1998/07/04 17:16:27 grubba Exp $ */
 
-/* $Id: colortable.c,v 1.30 1998/03/03 22:30:28 hubbe Exp $ */
+#include "global.h"
+
+#include "config.h"
 
 /*
 **! module Image
 **! note
-**!	$Id: colortable.c,v 1.30 1998/03/03 22:30:28 hubbe Exp $
+**!	$Id: colortable.c,v 1.31 1998/07/04 17:16:27 grubba Exp $
 **! class colortable
 **!
 **!	This object keeps colortable information,
@@ -20,8 +22,7 @@
 #undef COLORTABLE_DEBUG
 #undef COLORTABLE_REDUCE_DEBUG
 
-#include "global.h"
-RCSID("$Id: colortable.c,v 1.30 1998/03/03 22:30:28 hubbe Exp $");
+RCSID("$Id: colortable.c,v 1.31 1998/07/04 17:16:27 grubba Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/modules/Image/encodings/gif.c b/src/modules/Image/encodings/gif.c
index a7e790b4fb6f92371e1181c9ad70a7e6aeee0e37..0275fe414d2263a524efa7b3fee7371e9cc84bec 100644
--- a/src/modules/Image/encodings/gif.c
+++ b/src/modules/Image/encodings/gif.c
@@ -1,9 +1,9 @@
-/* $Id: gif.c,v 1.21 1998/03/03 11:24:45 hubbe Exp $ */
+/* $Id: gif.c,v 1.22 1998/07/04 17:14:52 grubba Exp $ */
 
 /*
 **! module Image
 **! note
-**!	$Id: gif.c,v 1.21 1998/03/03 11:24:45 hubbe Exp $
+**!	$Id: gif.c,v 1.22 1998/07/04 17:14:52 grubba Exp $
 **! submodule GIF
 **!
 **!	This submodule keep the GIF encode/decode capabilities
@@ -26,12 +26,13 @@
 **! see also: Image, Image.image, Image.colortable
 */
 
+#include "global.h"
+
 #include <math.h>
 #include <ctype.h>
 
 #include "stralloc.h"
-#include "global.h"
-RCSID("$Id: gif.c,v 1.21 1998/03/03 11:24:45 hubbe Exp $");
+RCSID("$Id: gif.c,v 1.22 1998/07/04 17:14:52 grubba Exp $");
 #include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
diff --git a/src/modules/Image/encodings/png.c b/src/modules/Image/encodings/png.c
index 90ed492b63b264e49126b4d429e235b5d4b9b3a1..26f28ac9e69df6b41a3540bd663227aab1faa389 100644
--- a/src/modules/Image/encodings/png.c
+++ b/src/modules/Image/encodings/png.c
@@ -1,9 +1,9 @@
-/* $Id: png.c,v 1.2 1998/03/03 11:24:45 hubbe Exp $ */
+/* $Id: png.c,v 1.3 1998/07/04 17:15:44 grubba Exp $ */
 
 /*
 **! module Image
 **! note
-**!	$Id: png.c,v 1.2 1998/03/03 11:24:45 hubbe Exp $
+**!	$Id: png.c,v 1.3 1998/07/04 17:15:44 grubba Exp $
 **! submodule PNG
 **!
 **!	This submodule keep the PNG encode/decode capabilities
@@ -18,12 +18,13 @@
 **! see also: Image, Image.image, Image.colortable
 */
 
+#include "global.h"
+
 #include <math.h>
 #include <ctype.h>
 
 #include "stralloc.h"
-#include "global.h"
-RCSID("$Id: png.c,v 1.2 1998/03/03 11:24:45 hubbe Exp $");
+RCSID("$Id: png.c,v 1.3 1998/07/04 17:15:44 grubba Exp $");
 #include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
diff --git a/src/modules/Image/encodings/pnm.c b/src/modules/Image/encodings/pnm.c
index 6a06b1ff88614839329f3450fd2e53b51ef76324..5e35965e60352bddc197ec52a532ba86c09f0612 100644
--- a/src/modules/Image/encodings/pnm.c
+++ b/src/modules/Image/encodings/pnm.c
@@ -1,9 +1,9 @@
-/* $Id: pnm.c,v 1.8 1998/06/22 16:41:38 grubba Exp $ */
+/* $Id: pnm.c,v 1.9 1998/07/04 17:15:21 grubba Exp $ */
 
 /*
 **! module Image
 **! note
-**!	$Id: pnm.c,v 1.8 1998/06/22 16:41:38 grubba Exp $
+**!	$Id: pnm.c,v 1.9 1998/07/04 17:15:21 grubba Exp $
 **! submodule PNM
 **!
 **!	This submodule keeps the PNM encode/decode capabilities
@@ -44,12 +44,13 @@
 **! see also: Image, Image.image, Image.GIF
 */
 
+#include "global.h"
+
 #include <math.h>
 #include <ctype.h>
 
 #include "stralloc.h"
-#include "global.h"
-RCSID("$Id: pnm.c,v 1.8 1998/06/22 16:41:38 grubba Exp $");
+RCSID("$Id: pnm.c,v 1.9 1998/07/04 17:15:21 grubba Exp $");
 #include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
diff --git a/src/modules/Image/font.c b/src/modules/Image/font.c
index 8ae179ea2758ab9d5f172eea8e7794d242329768..c5427616148bd016fae9b6a27217233b3968e77a 100644
--- a/src/modules/Image/font.c
+++ b/src/modules/Image/font.c
@@ -1,12 +1,14 @@
-/* $Id: font.c,v 1.22 1998/03/03 11:24:43 hubbe Exp $ */
-#include <config.h>
+/* $Id: font.c,v 1.23 1998/07/04 17:14:26 grubba Exp $ */
+#include "global.h"
+
+#include "config.h"
 
 #define SPACE_CHAR 'i'
 
 /*
 **! module Image
 **! note
-**!	$Id: font.c,v 1.22 1998/03/03 11:24:43 hubbe Exp $
+**!	$Id: font.c,v 1.23 1998/07/04 17:14:26 grubba Exp $
 **! class font
 **!
 **! note
@@ -93,8 +95,6 @@ Kerningtable types:
 
 
 
-#include "global.h"
-
 #include <sys/types.h>
 #include <sys/stat.h>
 
diff --git a/src/modules/MIME/mime.c b/src/modules/MIME/mime.c
index da5c9af598b1ac814fb20d495f6d5fddef313747..8c2c7d4057ea955b1c671103e0fdeddee660b596 100644
--- a/src/modules/MIME/mime.c
+++ b/src/modules/MIME/mime.c
@@ -1,15 +1,16 @@
 /*
- * $Id: mime.c,v 1.10 1997/06/26 01:02:48 marcus Exp $
+ * $Id: mime.c,v 1.11 1998/07/04 17:16:51 grubba Exp $
  *
  * RFC1521 functionality for Pike
  *
  * Marcus Comstedt 1996-1997
  */
 
+#include "global.h"
+
 #include "config.h"
 
-#include "global.h"
-RCSID("$Id: mime.c,v 1.10 1997/06/26 01:02:48 marcus Exp $");
+RCSID("$Id: mime.c,v 1.11 1998/07/04 17:16:51 grubba Exp $");
 #include "stralloc.h"
 #include "pike_macros.h"
 #include "object.h"
diff --git a/src/modules/Mysql/mysql.c b/src/modules/Mysql/mysql.c
index 2d021fcbbe7c19a067b2abdeb2a90f7430a29da1..00e6fa1d8cab496c4588655db2c78e8b85967998 100644
--- a/src/modules/Mysql/mysql.c
+++ b/src/modules/Mysql/mysql.c
@@ -1,11 +1,14 @@
 /*
- * $Id: mysql.c,v 1.15 1998/03/16 14:55:03 grubba Exp $
+ * $Id: mysql.c,v 1.16 1998/07/04 17:18:01 grubba Exp $
  *
  * SQL database functionality for Pike
  *
  * Henrik Grubbström 1996-12-21
  */
 
+/* Pike master headerfile */
+#include "global.h"
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
@@ -44,7 +47,6 @@ typedef struct dynamic_buffer_s dynamic_buffer;
 #endif /* HAVE_MYSQL */
 
 /* From the Pike-dist */
-#include "global.h"
 #include "svalue.h"
 #include "object.h"
 #include "stralloc.h"
@@ -73,7 +75,7 @@ typedef struct dynamic_buffer_s dynamic_buffer;
  * Globals
  */
 
-RCSID("$Id: mysql.c,v 1.15 1998/03/16 14:55:03 grubba Exp $");
+RCSID("$Id: mysql.c,v 1.16 1998/07/04 17:18:01 grubba Exp $");
 
 struct program *mysql_program = NULL;
 
diff --git a/src/operators.c b/src/operators.c
index dbc6eb4b0a19a90ed31873a6657fb87330401c3c..9cb1f93997f48bcbe49d0b87ee7d6145e627740a 100644
--- a/src/operators.c
+++ b/src/operators.c
@@ -3,9 +3,9 @@
 ||| Pike is distributed as GPL (General Public License)
 ||| See the files COPYING and DISCLAIMER for more information.
 \*/
-#include <math.h>
 #include "global.h"
-RCSID("$Id: operators.c,v 1.21 1997/12/03 22:46:17 hubbe Exp $");
+#include <math.h>
+RCSID("$Id: operators.c,v 1.22 1998/07/04 17:18:30 grubba Exp $");
 #include "interpret.h"
 #include "svalue.h"
 #include "multiset.h"