diff --git a/src/modules/Msql/msqlmod.c b/src/modules/Msql/msqlmod.c
index 4ecef228ab4485b4d2bbc7f316694d19f79405d3..e342ed1345f12b63737ca46bcb6410fe44d39a62 100644
--- a/src/modules/Msql/msqlmod.c
+++ b/src/modules/Msql/msqlmod.c
@@ -2,13 +2,14 @@
  * This code is (C) Francesco Chemolli, 1997.
  * You may use, modify and redistribute it freely under the terms
  * of the GNU General Public License, version 2.
- * $Id: msqlmod.c,v 1.7 1998/03/03 14:17:45 grubba Exp $
+ * $Id: msqlmod.c,v 1.8 1998/07/04 16:43:45 grubba Exp $
  *
  * This version is intended for Pike/0.5 and later.
  * It won't compile under older versions of the Pike interpreter.
  */
 
 /* All this code is pretty useless if we don't have a msql library...*/
+#include "global.h"
 #include "msql_config.h"
 #ifdef HAVE_MSQL
 
@@ -21,7 +22,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "global.h"
 #include "threads.h"
 #include "machine.h"
 #include "interpret.h"
@@ -35,7 +35,7 @@
 #include "operators.h"
 #include "multiset.h"
 
-RCSID("$Id: msqlmod.c,v 1.7 1998/03/03 14:17:45 grubba Exp $");
+RCSID("$Id: msqlmod.c,v 1.8 1998/07/04 16:43:45 grubba Exp $");
 #include "version.h"
 
 #ifdef _REENTRANT
diff --git a/src/modules/Mysql/result.c b/src/modules/Mysql/result.c
index fa4cc4fa201fb18db56a8c783864ace1671d9ac5..2aba0986f38927093be99730dfb853f00db69c43 100644
--- a/src/modules/Mysql/result.c
+++ b/src/modules/Mysql/result.c
@@ -1,11 +1,14 @@
 /*
- * $Id: result.c,v 1.10 1997/12/12 17:07:13 grubba Exp $
+ * $Id: result.c,v 1.11 1998/07/04 16:44:37 grubba Exp $
  *
  * mysql query result
  *
  * Henrik Grubbström 1996-12-21
  */
 
+/* Pike master include file */
+#include "global.h"
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
@@ -41,7 +44,6 @@
 typedef struct dynamic_buffer_s dynamic_buffer;
 
 /* From the Pike-dist */
-#include "global.h"
 #include "svalue.h"
 #include "mapping.h"
 #include "object.h"
@@ -78,7 +80,7 @@ typedef struct dynamic_buffer_s dynamic_buffer;
  * Globals
  */
 
-RCSID("$Id: result.c,v 1.10 1997/12/12 17:07:13 grubba Exp $");
+RCSID("$Id: result.c,v 1.11 1998/07/04 16:44:37 grubba Exp $");
 
 struct program *mysql_result_program = NULL;
 
diff --git a/src/modules/Odbc/odbc.c b/src/modules/Odbc/odbc.c
index 4df7ad080f5bae7561855721c8c3bb9bd6b90626..fd1c82a24f742ba7dd950415f64eaca619962675 100644
--- a/src/modules/Odbc/odbc.c
+++ b/src/modules/Odbc/odbc.c
@@ -1,5 +1,5 @@
 /*
- * $Id: odbc.c,v 1.7 1998/05/31 17:17:12 grubba Exp $
+ * $Id: odbc.c,v 1.8 1998/07/04 16:45:12 grubba Exp $
  *
  * Pike interface to ODBC compliant databases.
  *
@@ -10,12 +10,13 @@
  * Includes
  */
 
+#include "global.h"
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
 
-#include "global.h"
-RCSID("$Id: odbc.c,v 1.7 1998/05/31 17:17:12 grubba Exp $");
+RCSID("$Id: odbc.c,v 1.8 1998/07/04 16:45:12 grubba Exp $");
 
 #include "interpret.h"
 #include "object.h"
diff --git a/src/modules/Odbc/odbc_result.c b/src/modules/Odbc/odbc_result.c
index f059271fab029dac6c528a7718020cb039ba3a0e..ccfc9aabcf1b558c896fef2a0cac1f02c8bafd41 100644
--- a/src/modules/Odbc/odbc_result.c
+++ b/src/modules/Odbc/odbc_result.c
@@ -1,5 +1,5 @@
 /*
- * $Id: odbc_result.c,v 1.10 1998/06/04 12:06:11 grubba Exp $
+ * $Id: odbc_result.c,v 1.11 1998/07/04 16:45:45 grubba Exp $
  *
  * Pike  interface to ODBC compliant databases
  *
@@ -10,14 +10,15 @@
  * Includes
  */
 
+#include "global.h"
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
 
 #ifdef HAVE_ODBC
 
-#include "global.h"
-RCSID("$Id: odbc_result.c,v 1.10 1998/06/04 12:06:11 grubba Exp $");
+RCSID("$Id: odbc_result.c,v 1.11 1998/07/04 16:45:45 grubba Exp $");
 
 #include "interpret.h"
 #include "object.h"
diff --git a/src/modules/Oracle/oracle.c b/src/modules/Oracle/oracle.c
index b8c18df4e1f0a729564b613c193a1c1ecabd2c45..91b96b02622d6edccd63c66d069f7c568a60396b 100644
--- a/src/modules/Oracle/oracle.c
+++ b/src/modules/Oracle/oracle.c
@@ -1,5 +1,5 @@
 /*
- * $Id: oracle.c,v 1.6 1997/12/07 21:50:48 grubba Exp $
+ * $Id: oracle.c,v 1.7 1998/07/04 16:46:15 grubba Exp $
  *
  * Pike interface to Oracle databases.
  *
@@ -10,11 +10,12 @@
  * Includes
  */
 
+#include "global.h"
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
 
-#include "global.h"
 #include "svalue.h"
 #include "object.h"
 #include "array.h"
@@ -34,7 +35,7 @@
 
 #endif
 
-RCSID("$Id: oracle.c,v 1.6 1997/12/07 21:50:48 grubba Exp $");
+RCSID("$Id: oracle.c,v 1.7 1998/07/04 16:46:15 grubba Exp $");
 
 #ifdef HAVE_ORACLE
 
diff --git a/src/modules/Postgres/pgresult.c b/src/modules/Postgres/pgresult.c
index a8f1bd6ca84ba0d12ad14c379454151430c5de43..eda1e0a7151d824cc80e77b178062ef0701c651f 100644
--- a/src/modules/Postgres/pgresult.c
+++ b/src/modules/Postgres/pgresult.c
@@ -31,6 +31,8 @@
  *   moving the check inside the actual sql classes.
  */
 
+#include "global.h"
+
 #include "pgres_config.h"
 #ifdef HAVE_POSTGRES
 
@@ -52,7 +54,6 @@
 #include <libpq-fe.h>
 
 /* Pike includes */
-#include "global.h"
 #include "stralloc.h"
 #include "object.h"
 #include "threads.h"
diff --git a/src/modules/Postgres/postgres.c b/src/modules/Postgres/postgres.c
index 02c294f2cfd85ba016d36c2e288506b3b82e86cd..584895e8e8f49a4856f5fd92366bb3e2967914e5 100644
--- a/src/modules/Postgres/postgres.c
+++ b/src/modules/Postgres/postgres.c
@@ -7,6 +7,8 @@
  * of the GNU General Public License, version 2.
  */
 
+#include "global.h"
+
 #include "pgres_config.h"
 #ifdef HAVE_POSTGRES
 
@@ -20,7 +22,6 @@
 #include <string.h>
 
 /* Pike includes */
-#include "global.h"
 #include "las.h"
 #include "machine.h"
 #include "pike_memory.h"
@@ -62,7 +63,7 @@ static void pgdebug (char * a, ...) {}
 
 struct program * postgres_program;
 
-RCSID("$Id: postgres.c,v 1.5 1998/03/02 18:56:07 grubba Exp $");
+RCSID("$Id: postgres.c,v 1.6 1998/07/04 16:47:32 grubba Exp $");
 
 #define THIS ((struct pgres_object_data *) fp->current_storage)
 
diff --git a/src/modules/Regexp/glue.c b/src/modules/Regexp/glue.c
index d6eda2a4cf1d65b7966502b9e3e5bb0bea36818c..f8eaafbac1a1755ed2d53841cace4e69e09c738c 100644
--- a/src/modules/Regexp/glue.c
+++ b/src/modules/Regexp/glue.c
@@ -4,11 +4,12 @@
 ||| See the files COPYING and DISCLAIMER for more information.
 \*/
 
+#include "global.h"
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
 
-#include "global.h"
 #include "interpret.h"
 #include "svalue.h"
 #include "stralloc.h"
diff --git a/src/modules/Ssleay/ssleay.c b/src/modules/Ssleay/ssleay.c
index 5720005e982dabfff54f9acbe0d8f18ad78f5923..0aac6f5a63115376543ee92c8ae612fac9b836c6 100644
--- a/src/modules/Ssleay/ssleay.c
+++ b/src/modules/Ssleay/ssleay.c
@@ -4,10 +4,11 @@
 ||| See the files COPYING and DISCLAIMER for more information.
 \*/
 
+#include "global.h"
+
 #include "config.h"
 
-#include "global.h"
-RCSID("$Id: ssleay.c,v 1.7 1997/08/30 18:36:14 grubba Exp $");
+RCSID("$Id: ssleay.c,v 1.8 1998/07/04 16:48:41 grubba Exp $");
 #include "interpret.h"
 #include "svalue.h"
 #include "stralloc.h"
diff --git a/src/modules/math/math.c b/src/modules/math/math.c
index be4b7fdc4effb4555bd91157a9e768a233bc4096..56d2ddb2d7ba243940d02a2b33cc6fd8b8b47b30 100644
--- a/src/modules/math/math.c
+++ b/src/modules/math/math.c
@@ -3,6 +3,9 @@
 ||| Pike is distributed as GPL (General Public License)
 ||| See the files COPYING and DISCLAIMER for more information.
 \*/
+
+#include "global.h"
+
 #include <math.h>
 #include "interpret.h"
 #include "constants.h"
diff --git a/src/modules/spider/dumudp.c b/src/modules/spider/dumudp.c
index 3105c58bb25d39e4417678fd44cdf53641df2598..5370834b09f44cc2eb83abdd49c8c423a13568e8 100644
--- a/src/modules/spider/dumudp.c
+++ b/src/modules/spider/dumudp.c
@@ -1,7 +1,8 @@
+#include "global.h"
+
 #include "config.h"
 
-#include "global.h"
-RCSID("$Id: dumudp.c,v 1.29 1998/03/03 11:24:47 hubbe Exp $");
+RCSID("$Id: dumudp.c,v 1.30 1998/07/04 16:52:16 grubba Exp $");
 #include "interpret.h"
 #include "svalue.h"
 #include "stralloc.h"
diff --git a/src/modules/system/passwords.c b/src/modules/system/passwords.c
index d66ce4897695e1c3a9b08f6a5331990892cb1f1d..b194cd36f71e20ca816f8e02dd0a8a1e11a0772c 100644
--- a/src/modules/system/passwords.c
+++ b/src/modules/system/passwords.c
@@ -1,5 +1,5 @@
 /*
- * $Id: passwords.c,v 1.6 1998/03/03 07:56:47 mast Exp $
+ * $Id: passwords.c,v 1.7 1998/07/04 16:52:53 grubba Exp $
  *
  * Password handling for Pike.
  *
@@ -10,12 +10,12 @@
  * Includes
  */
 
+#include "global.h"
+
 #include "system_machine.h"
 #include "system.h"
 
-#include "global.h"
-
-RCSID("$Id: passwords.c,v 1.6 1998/03/03 07:56:47 mast Exp $");
+RCSID("$Id: passwords.c,v 1.7 1998/07/04 16:52:53 grubba Exp $");
 
 #include "module_support.h"
 #include "interpret.h"
diff --git a/src/modules/system/syslog.c b/src/modules/system/syslog.c
index 9249e80da6455d50a8520e1a696951d656560946..041fea93f932488090c78a892eaa795d07251baf 100644
--- a/src/modules/system/syslog.c
+++ b/src/modules/system/syslog.c
@@ -1,5 +1,5 @@
 /*
- * $Id: syslog.c,v 1.4 1997/12/07 21:59:15 grubba Exp $
+ * $Id: syslog.c,v 1.5 1998/07/04 16:53:18 grubba Exp $
  *
  * Access to syslog from Pike.
  *
@@ -10,14 +10,14 @@
  * Includes
  */
 
+#include "global.h"
+
 #include "system_machine.h"
 #include "system.h"
 
-#include "global.h"
-
 #ifdef HAVE_SYSLOG
 
-RCSID("$Id: syslog.c,v 1.4 1997/12/07 21:59:15 grubba Exp $");
+RCSID("$Id: syslog.c,v 1.5 1998/07/04 16:53:18 grubba Exp $");
 
 #include "interpret.h"
 #include "svalue.h"
diff --git a/src/modules/system/system.c b/src/modules/system/system.c
index 2847eef7603f3c7b20e8e85bf36c690b98956278..5cc9a3472d18f50f4b922b2951e5de7e03a430ba 100644
--- a/src/modules/system/system.c
+++ b/src/modules/system/system.c
@@ -1,5 +1,5 @@
 /*
- * $Id: system.c,v 1.34 1998/03/03 11:24:48 hubbe Exp $
+ * $Id: system.c,v 1.35 1998/07/04 16:53:46 grubba Exp $
  *
  * System-call module for Pike
  *
@@ -10,11 +10,12 @@
  * Includes
  */
 
+#include "global.h"
+
 #include "system_machine.h"
 #include "system.h"
 
-#include "global.h"
-RCSID("$Id: system.c,v 1.34 1998/03/03 11:24:48 hubbe Exp $");
+RCSID("$Id: system.c,v 1.35 1998/07/04 16:53:46 grubba Exp $");
 #include "module_support.h"
 #include "las.h"
 #include "interpret.h"