diff --git a/src/modules/Oracle/oracle.c b/src/modules/Oracle/oracle.c
index bd145079758b5a70cb00f924964d3923df11fb41..b8c18df4e1f0a729564b613c193a1c1ecabd2c45 100644
--- a/src/modules/Oracle/oracle.c
+++ b/src/modules/Oracle/oracle.c
@@ -1,5 +1,5 @@
 /*
- * $Id: oracle.c,v 1.5 1997/09/26 21:05:44 marcus Exp $
+ * $Id: oracle.c,v 1.6 1997/12/07 21:50:48 grubba Exp $
  *
  * Pike interface to Oracle databases.
  *
@@ -14,18 +14,18 @@
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
 
-#include <global.h>
-#include <svalue.h>
-#include <object.h>
-#include <array.h>
-#include <stralloc.h>
-#include <interpret.h>
-#include <pike_types.h>
-#include <pike_memory.h>
-#include <threads.h>
-#include <module_support.h>
-#include <mapping.h>
-#include <builtin_functions.h>
+#include "global.h"
+#include "svalue.h"
+#include "object.h"
+#include "array.h"
+#include "stralloc.h"
+#include "interpret.h"
+#include "pike_types.h"
+#include "pike_memory.h"
+#include "threads.h"
+#include "module_support.h"
+#include "mapping.h"
+#include "builtin_functions.h"
 
 #ifdef HAVE_ORACLE
 
@@ -34,7 +34,7 @@
 
 #endif
 
-RCSID("$Id: oracle.c,v 1.5 1997/09/26 21:05:44 marcus Exp $");
+RCSID("$Id: oracle.c,v 1.6 1997/12/07 21:50:48 grubba Exp $");
 
 #ifdef HAVE_ORACLE
 
diff --git a/src/modules/Regexp/glue.c b/src/modules/Regexp/glue.c
index 837fdf99aa1623f215e9ca4a84fbe5d42dac3f6a..d6eda2a4cf1d65b7966502b9e3e5bb0bea36818c 100644
--- a/src/modules/Regexp/glue.c
+++ b/src/modules/Regexp/glue.c
@@ -27,7 +27,7 @@ struct regexp_glue
   int num_paren;
 };
 #else
-#include <pike_regexp.h>
+#include "pike_regexp.h"
 
 struct regexp_glue
 {
diff --git a/src/modules/_Crypto/include/crypto_types.h b/src/modules/_Crypto/include/crypto_types.h
index 5e664293336ad9ea18b91c264c4bdcf60ac79d85..b6883e8b1078921773c44879dd407edebb5ca44e 100644
--- a/src/modules/_Crypto/include/crypto_types.h
+++ b/src/modules/_Crypto/include/crypto_types.h
@@ -6,8 +6,8 @@
 #define CRYPTO_TYPES_H_INCLUDED
 
 #ifdef PIKE
-#include <pike_types.h>
-#include <global.h>
+#include "pike_types.h"
+#include "global.h"
 #else /* !PIKE */
 #define INT32 long
 #define INT16 short
diff --git a/src/modules/spider/accesseddb.c b/src/modules/spider/accesseddb.c
index 35a4b5068b0d540932bbcd7b8f334d7cef484099..ecea475466d24f43f5cdb2605a5bac838dfb2e82 100644
--- a/src/modules/spider/accesseddb.c
+++ b/src/modules/spider/accesseddb.c
@@ -1,4 +1,4 @@
-#include <config.h>
+#include "config.h"
 
 #include "stralloc.h"
 #include "global.h"
diff --git a/src/modules/spider/dumudp.c b/src/modules/spider/dumudp.c
index 8dbdabb1e30d5593ecd8e47579baf3968c58f9b2..fb6f4019467da31a3d9dfe2d2ac35b8c1f601b4f 100644
--- a/src/modules/spider/dumudp.c
+++ b/src/modules/spider/dumudp.c
@@ -1,7 +1,7 @@
-#include <config.h>
+#include "config.h"
 
 #include "global.h"
-RCSID("$Id: dumudp.c,v 1.27 1997/10/14 01:06:39 grubba Exp $");
+RCSID("$Id: dumudp.c,v 1.28 1997/12/07 21:58:12 grubba Exp $");
 #include "interpret.h"
 #include "svalue.h"
 #include "stralloc.h"
diff --git a/src/modules/spider/spider.c b/src/modules/spider/spider.c
index a539d212f20a62383769face04f17da3d8548bda..5c4640b041fca343bb215bbc3ee37247a4b88e3c 100644
--- a/src/modules/spider/spider.c
+++ b/src/modules/spider/spider.c
@@ -1,4 +1,4 @@
-#include <config.h>
+#include "config.h"
 
 
 #include "machine.h"
@@ -40,7 +40,7 @@
 #include "threads.h"
 #include "operators.h"
 
-RCSID("$Id: spider.c,v 1.47 1997/12/06 03:47:13 grubba Exp $");
+RCSID("$Id: spider.c,v 1.48 1997/12/07 21:56:42 grubba Exp $");
 
 #ifdef HAVE_PWD_H
 #include <pwd.h>
diff --git a/src/modules/spider/stardate.c b/src/modules/spider/stardate.c
index 64fdff266c117389f652a5a1c3502e85639e1d7b..cf05831fcdfb1e0676b72089eb30fd3818ff828b 100644
--- a/src/modules/spider/stardate.c
+++ b/src/modules/spider/stardate.c
@@ -1,4 +1,4 @@
-#include <config.h>
+#include "config.h"
 
 #include "stralloc.h"
 #include "global.h"
diff --git a/src/modules/system/passwords.c b/src/modules/system/passwords.c
index 945054391e50b7176171334d63ccf265d1259917..321a635dfd345db282f3e23fbe22cdf6f62c00ac 100644
--- a/src/modules/system/passwords.c
+++ b/src/modules/system/passwords.c
@@ -1,5 +1,5 @@
 /*
- * $Id: passwords.c,v 1.4 1997/09/07 11:37:00 per Exp $
+ * $Id: passwords.c,v 1.5 1997/12/07 22:00:27 grubba Exp $
  *
  * Password handling for Pike.
  *
@@ -13,16 +13,16 @@
 #include "system_machine.h"
 #include "system.h"
 
-#include <global.h>
+#include "global.h"
 
-RCSID("$Id: passwords.c,v 1.4 1997/09/07 11:37:00 per Exp $");
+RCSID("$Id: passwords.c,v 1.5 1997/12/07 22:00:27 grubba Exp $");
 
-#include <module_support.h>
-#include <interpret.h>
-#include <stralloc.h>
-#include <threads.h>
-#include <svalue.h>
-#include <builtin_functions.h>
+#include "module_support.h"
+#include "interpret.h"
+#include "stralloc.h"
+#include "threads.h"
+#include "svalue.h"
+#include "builtin_functions.h"
 
 #ifdef HAVE_PASSWD_H
 # include <passwd.h>
diff --git a/src/modules/system/syslog.c b/src/modules/system/syslog.c
index 74eeede36e1cce2f157e83a7105f7af1a88db026..9249e80da6455d50a8520e1a696951d656560946 100644
--- a/src/modules/system/syslog.c
+++ b/src/modules/system/syslog.c
@@ -1,5 +1,5 @@
 /*
- * $Id: syslog.c,v 1.3 1997/04/16 03:14:05 hubbe Exp $
+ * $Id: syslog.c,v 1.4 1997/12/07 21:59:15 grubba Exp $
  *
  * Access to syslog from Pike.
  *
@@ -13,18 +13,18 @@
 #include "system_machine.h"
 #include "system.h"
 
-#include <global.h>
+#include "global.h"
 
 #ifdef HAVE_SYSLOG
 
-RCSID("$Id: syslog.c,v 1.3 1997/04/16 03:14:05 hubbe Exp $");
+RCSID("$Id: syslog.c,v 1.4 1997/12/07 21:59:15 grubba Exp $");
 
-#include <interpret.h>
-#include <svalue.h>
-#include <stralloc.h>
-#include <threads.h>
-#include <module_support.h>
-#include <builtin_functions.h>
+#include "interpret.h"
+#include "svalue.h"
+#include "stralloc.h"
+#include "threads.h"
+#include "module_support.h"
+#include "builtin_functions.h"
 
 #ifdef HAVE_SYSLOG_H
 #include <syslog.h>
diff --git a/src/modules/system/system.c b/src/modules/system/system.c
index b7c9fa464d1d829c7c5018ca94cb0059cbb0b046..deb83401e3b9aae14ae86c73ef003f6ddb09e6c7 100644
--- a/src/modules/system/system.c
+++ b/src/modules/system/system.c
@@ -1,5 +1,5 @@
 /*
- * $Id: system.c,v 1.30 1997/10/25 18:10:00 grubba Exp $
+ * $Id: system.c,v 1.31 1997/12/07 22:01:35 grubba Exp $
  *
  * System-call module for Pike
  *
@@ -13,17 +13,17 @@
 #include "system_machine.h"
 #include "system.h"
 
-#include <global.h>
-RCSID("$Id: system.c,v 1.30 1997/10/25 18:10:00 grubba Exp $");
-#include <module_support.h>
-#include <las.h>
-#include <interpret.h>
-#include <stralloc.h>
-#include <threads.h>
-#include <svalue.h>
-#include <mapping.h>
-#include <builtin_functions.h>
-#include <constants.h>
+#include "global.h"
+RCSID("$Id: system.c,v 1.31 1997/12/07 22:01:35 grubba Exp $");
+#include "module_support.h"
+#include "las.h"
+#include "interpret.h"
+#include "stralloc.h"
+#include "threads.h"
+#include "svalue.h"
+#include "mapping.h"
+#include "builtin_functions.h"
+#include "constants.h"
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>