From a0ffab351e2dca12200e95c45f6edf5ddebe78b0 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Tue, 30 May 2006 22:12:16 +0000
Subject: [PATCH] Magic blocks don't do us any good unless we use 'em ... so
 install one in every shared library.

---
 contrib/btree_gist/btree_gist.c                             | 2 ++
 contrib/chkpass/chkpass.c                                   | 4 +++-
 contrib/cube/cube.c                                         | 4 +++-
 contrib/dblink/dblink.c                                     | 4 +++-
 contrib/dbmirror/pending.c                                  | 6 ++++--
 contrib/earthdistance/earthdistance.c                       | 4 +++-
 contrib/fulltextindex/fti.c                                 | 4 +++-
 contrib/fuzzystrmatch/fuzzystrmatch.c                       | 4 +++-
 contrib/intagg/int_aggregate.c                              | 3 ++-
 contrib/intarray/_int_op.c                                  | 2 ++
 contrib/isbn_issn/isbn_issn.c                               | 6 +++++-
 contrib/lo/lo.c                                             | 3 ++-
 contrib/ltree/ltree_op.c                                    | 3 ++-
 contrib/pg_buffercache/pg_buffercache_pages.c               | 4 +++-
 contrib/pg_freespacemap/pg_freespacemap.c                   | 4 +++-
 contrib/pg_trgm/trgm_op.c                                   | 2 ++
 contrib/pgcrypto/pgcrypto.c                                 | 4 +++-
 contrib/pgrowlocks/pgrowlocks.c                             | 4 +++-
 contrib/pgstattuple/pgstattuple.c                           | 4 +++-
 contrib/seg/seg.c                                           | 2 ++
 contrib/spi/autoinc.c                                       | 2 ++
 contrib/spi/insert_username.c                               | 4 +++-
 contrib/spi/moddatetime.c                                   | 4 +++-
 contrib/spi/refint.c                                        | 2 ++
 contrib/spi/timetravel.c                                    | 2 ++
 contrib/tablefunc/tablefunc.c                               | 2 ++
 contrib/tsearch2/ts_cfg.c                                   | 2 ++
 contrib/userlock/user_locks.c                               | 1 +
 contrib/xml2/xslt_proc.c                                    | 2 ++
 .../utils/mb/conversion_procs/ascii_and_mic/ascii_and_mic.c | 4 +++-
 .../mb/conversion_procs/cyrillic_and_mic/cyrillic_and_mic.c | 4 +++-
 .../mb/conversion_procs/euc_cn_and_mic/euc_cn_and_mic.c     | 4 +++-
 .../mb/conversion_procs/euc_jp_and_sjis/euc_jp_and_sjis.c   | 4 +++-
 .../mb/conversion_procs/euc_kr_and_mic/euc_kr_and_mic.c     | 4 +++-
 .../mb/conversion_procs/euc_tw_and_big5/euc_tw_and_big5.c   | 4 +++-
 .../latin2_and_win1250/latin2_and_win1250.c                 | 4 +++-
 .../utils/mb/conversion_procs/latin_and_mic/latin_and_mic.c | 4 +++-
 .../mb/conversion_procs/utf8_and_ascii/utf8_and_ascii.c     | 4 +++-
 .../utils/mb/conversion_procs/utf8_and_big5/utf8_and_big5.c | 4 +++-
 .../conversion_procs/utf8_and_cyrillic/utf8_and_cyrillic.c  | 4 +++-
 .../mb/conversion_procs/utf8_and_euc_cn/utf8_and_euc_cn.c   | 4 +++-
 .../mb/conversion_procs/utf8_and_euc_jp/utf8_and_euc_jp.c   | 4 +++-
 .../mb/conversion_procs/utf8_and_euc_kr/utf8_and_euc_kr.c   | 4 +++-
 .../mb/conversion_procs/utf8_and_euc_tw/utf8_and_euc_tw.c   | 4 +++-
 .../mb/conversion_procs/utf8_and_gb18030/utf8_and_gb18030.c | 4 +++-
 .../utils/mb/conversion_procs/utf8_and_gbk/utf8_and_gbk.c   | 4 +++-
 .../mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c | 4 +++-
 .../utf8_and_iso8859_1/utf8_and_iso8859_1.c                 | 4 +++-
 .../mb/conversion_procs/utf8_and_johab/utf8_and_johab.c     | 4 +++-
 .../utils/mb/conversion_procs/utf8_and_sjis/utf8_and_sjis.c | 4 +++-
 .../utils/mb/conversion_procs/utf8_and_uhc/utf8_and_uhc.c   | 4 +++-
 .../utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c   | 4 +++-
 src/pl/plperl/plperl.c                                      | 4 +++-
 src/pl/plpgsql/src/pl_handler.c                             | 4 +++-
 src/pl/plpython/plpython.c                                  | 4 +++-
 src/pl/tcl/pltcl.c                                          | 3 ++-
 src/tutorial/complex.c                                      | 2 ++
 src/tutorial/funcs_new.c                                    | 4 +++-
 58 files changed, 160 insertions(+), 47 deletions(-)

diff --git a/contrib/btree_gist/btree_gist.c b/contrib/btree_gist/btree_gist.c
index a64a6cb7c12..c5c7bb88bbb 100644
--- a/contrib/btree_gist/btree_gist.c
+++ b/contrib/btree_gist/btree_gist.c
@@ -1,5 +1,7 @@
 #include "btree_gist.h"
 
+PG_MODULE_MAGIC;
+
 PG_FUNCTION_INFO_V1(gbt_decompress);
 PG_FUNCTION_INFO_V1(gbtreekey_in);
 PG_FUNCTION_INFO_V1(gbtreekey_out);
diff --git a/contrib/chkpass/chkpass.c b/contrib/chkpass/chkpass.c
index e20164eed2b..04591bd154d 100644
--- a/contrib/chkpass/chkpass.c
+++ b/contrib/chkpass/chkpass.c
@@ -4,7 +4,7 @@
  * darcy@druid.net
  * http://www.druid.net/darcy/
  *
- * $PostgreSQL: pgsql/contrib/chkpass/chkpass.c,v 1.15 2006/03/19 22:22:55 neilc Exp $
+ * $PostgreSQL: pgsql/contrib/chkpass/chkpass.c,v 1.16 2006/05/30 22:12:12 tgl Exp $
  * best viewed with tabs set to 4
  */
 
@@ -20,6 +20,8 @@
 
 #include "fmgr.h"
 
+PG_MODULE_MAGIC;
+
 /*
  * This type encrypts it's input unless the first character is a colon.
  * The output is the encrypted form with a leading colon.  The output
diff --git a/contrib/cube/cube.c b/contrib/cube/cube.c
index c6df246d259..944eee62b17 100644
--- a/contrib/cube/cube.c
+++ b/contrib/cube/cube.c
@@ -1,5 +1,5 @@
 /******************************************************************************
-  $PostgreSQL: pgsql/contrib/cube/cube.c,v 1.24 2006/03/11 04:38:28 momjian Exp $
+  $PostgreSQL: pgsql/contrib/cube/cube.c,v 1.25 2006/05/30 22:12:12 tgl Exp $
 
   This file contains routines that can be bound to a Postgres backend and
   called by the backend in the process of processing queries.  The calling
@@ -18,6 +18,8 @@
 
 #include "cubedata.h"
 
+PG_MODULE_MAGIC;
+
 extern int	cube_yyparse();
 extern void cube_yyerror(const char *message);
 extern void cube_scanner_init(const char *str);
diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c
index 42ffd6f3b61..e8b30185762 100644
--- a/contrib/dblink/dblink.c
+++ b/contrib/dblink/dblink.c
@@ -8,7 +8,7 @@
  * Darko Prenosil <Darko.Prenosil@finteh.hr>
  * Shridhar Daithankar <shridhar_daithankar@persistent.co.in>
  *
- * $PostgreSQL: pgsql/contrib/dblink/dblink.c,v 1.54 2006/03/11 04:38:29 momjian Exp $
+ * $PostgreSQL: pgsql/contrib/dblink/dblink.c,v 1.55 2006/05/30 22:12:12 tgl Exp $
  * Copyright (c) 2001-2006, PostgreSQL Global Development Group
  * ALL RIGHTS RESERVED;
  *
@@ -61,6 +61,8 @@
 
 #include "dblink.h"
 
+PG_MODULE_MAGIC;
+
 typedef struct remoteConn
 {
 	PGconn	   *conn;			/* Hold the remote connection */
diff --git a/contrib/dbmirror/pending.c b/contrib/dbmirror/pending.c
index 3a405d12702..cfee9561ac7 100644
--- a/contrib/dbmirror/pending.c
+++ b/contrib/dbmirror/pending.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * pending.c
- * $Id: pending.c,v 1.24 2006/05/19 02:38:47 momjian Exp $
- * $PostgreSQL: pgsql/contrib/dbmirror/pending.c,v 1.24 2006/05/19 02:38:47 momjian Exp $
+ * $Id: pending.c,v 1.25 2006/05/30 22:12:12 tgl Exp $
+ * $PostgreSQL: pgsql/contrib/dbmirror/pending.c,v 1.25 2006/05/30 22:12:12 tgl Exp $
  *
  * This file contains a trigger for Postgresql-7.x to record changes to tables
  * to a pending table for mirroring.
@@ -38,6 +38,8 @@
 #include "utils/lsyscache.h"
 #include "utils/array.h"
 
+PG_MODULE_MAGIC;
+
 enum FieldUsage
 {
 	PRIMARY = 0, NONPRIMARY, ALL, NUM_FIELDUSAGE
diff --git a/contrib/earthdistance/earthdistance.c b/contrib/earthdistance/earthdistance.c
index d3032bde887..1f7baa3c30a 100644
--- a/contrib/earthdistance/earthdistance.c
+++ b/contrib/earthdistance/earthdistance.c
@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/contrib/earthdistance/earthdistance.c,v 1.10 2006/03/11 04:38:29 momjian Exp $ */
+/* $PostgreSQL: pgsql/contrib/earthdistance/earthdistance.c,v 1.11 2006/05/30 22:12:12 tgl Exp $ */
 
 #include "postgres.h"
 
@@ -7,6 +7,8 @@
 #include "utils/geo_decls.h"	/* for Pt */
 
 
+PG_MODULE_MAGIC;
+
 /* Earth's radius is in statute miles. */
 const double EARTH_RADIUS = 3958.747716;
 const double TWO_PI = 2.0 * M_PI;
diff --git a/contrib/fulltextindex/fti.c b/contrib/fulltextindex/fti.c
index 938e7748c54..a0282ec95b5 100644
--- a/contrib/fulltextindex/fti.c
+++ b/contrib/fulltextindex/fti.c
@@ -8,7 +8,7 @@
 /*
  *	Trigger function accepts variable number of arguments:
  *
- * $PostgreSQL: pgsql/contrib/fulltextindex/fti.c,v 1.26 2006/03/11 04:38:29 momjian Exp $
+ * $PostgreSQL: pgsql/contrib/fulltextindex/fti.c,v 1.27 2006/05/30 22:12:12 tgl Exp $
  *
  *		1. relation in which to store the substrings
  *		2. fields to extract substrings from
@@ -88,6 +88,8 @@
  *	 that can build the final query automagically?
  */
 
+PG_MODULE_MAGIC;
+
 #define MAX_FTI_QUERY_LENGTH 8192
 
 extern Datum fti(PG_FUNCTION_ARGS);
diff --git a/contrib/fuzzystrmatch/fuzzystrmatch.c b/contrib/fuzzystrmatch/fuzzystrmatch.c
index 29bba52596c..9b12c8f1fd4 100644
--- a/contrib/fuzzystrmatch/fuzzystrmatch.c
+++ b/contrib/fuzzystrmatch/fuzzystrmatch.c
@@ -5,7 +5,7 @@
  *
  * Joe Conway <mail@joeconway.com>
  *
- * $PostgreSQL: pgsql/contrib/fuzzystrmatch/fuzzystrmatch.c,v 1.20 2006/03/19 22:22:56 neilc Exp $
+ * $PostgreSQL: pgsql/contrib/fuzzystrmatch/fuzzystrmatch.c,v 1.21 2006/05/30 22:12:13 tgl Exp $
  * Copyright (c) 2001-2006, PostgreSQL Global Development Group
  * ALL RIGHTS RESERVED;
  *
@@ -45,6 +45,8 @@
 
 #include "fuzzystrmatch.h"
 
+PG_MODULE_MAGIC;
+
 /*
  * Calculates Levenshtein Distance between two strings.
  * Uses simplest and fastest cost model only, i.e. assumes a cost of 1 for
diff --git a/contrib/intagg/int_aggregate.c b/contrib/intagg/int_aggregate.c
index d081278634b..d75ce361061 100644
--- a/contrib/intagg/int_aggregate.c
+++ b/contrib/intagg/int_aggregate.c
@@ -5,7 +5,7 @@
  * DMN Digital Music Network.
  * www.dmn.com
  *
- * $PostgreSQL: pgsql/contrib/intagg/int_aggregate.c,v 1.23 2006/03/11 04:38:29 momjian Exp $
+ * $PostgreSQL: pgsql/contrib/intagg/int_aggregate.c,v 1.24 2006/05/30 22:12:13 tgl Exp $
  *
  * Copyright (C) Digital Music Network
  * December 20, 2001
@@ -34,6 +34,7 @@
 #include "utils/memutils.h"
 #include "utils/lsyscache.h"
 
+PG_MODULE_MAGIC;
 
 /*
  * This is actually a postgres version of a one dimensional array.
diff --git a/contrib/intarray/_int_op.c b/contrib/intarray/_int_op.c
index 036c357fb07..40650b6af88 100644
--- a/contrib/intarray/_int_op.c
+++ b/contrib/intarray/_int_op.c
@@ -2,6 +2,8 @@
 
 #include "lib/stringinfo.h"
 
+PG_MODULE_MAGIC;
+
 PG_FUNCTION_INFO_V1(_int_different);
 PG_FUNCTION_INFO_V1(_int_same);
 PG_FUNCTION_INFO_V1(_int_contains);
diff --git a/contrib/isbn_issn/isbn_issn.c b/contrib/isbn_issn/isbn_issn.c
index ed8707e05ff..7f84951c066 100644
--- a/contrib/isbn_issn/isbn_issn.c
+++ b/contrib/isbn_issn/isbn_issn.c
@@ -1,11 +1,15 @@
 /*
  *	PostgreSQL type definitions for ISBNs.
  *
- *	$PostgreSQL: pgsql/contrib/isbn_issn/isbn_issn.c,v 1.8 2006/03/01 06:30:31 neilc Exp $
+ *	$PostgreSQL: pgsql/contrib/isbn_issn/isbn_issn.c,v 1.9 2006/05/30 22:12:13 tgl Exp $
  */
 
 #include "postgres.h"
 
+#include "fmgr.h"
+
+
+PG_MODULE_MAGIC;
 
 /*
  *	This is the internal storage format for ISBNs.
diff --git a/contrib/lo/lo.c b/contrib/lo/lo.c
index 8d6ba169a22..c5cf2cf75b1 100644
--- a/contrib/lo/lo.c
+++ b/contrib/lo/lo.c
@@ -1,7 +1,7 @@
 /*
  *	PostgreSQL definitions for managed Large Objects.
  *
- *	$PostgreSQL: pgsql/contrib/lo/lo.c,v 1.15 2005/06/23 00:06:37 tgl Exp $
+ *	$PostgreSQL: pgsql/contrib/lo/lo.c,v 1.16 2006/05/30 22:12:13 tgl Exp $
  *
  */
 
@@ -17,6 +17,7 @@
 /* Required for triggers */
 #include "commands/trigger.h"
 
+PG_MODULE_MAGIC;
 
 #define atooid(x)  ((Oid) strtoul((x), NULL, 10))
 
diff --git a/contrib/ltree/ltree_op.c b/contrib/ltree/ltree_op.c
index 4a49e35ce86..86178d0a9e2 100644
--- a/contrib/ltree/ltree_op.c
+++ b/contrib/ltree/ltree_op.c
@@ -1,7 +1,7 @@
 /*
  * op function for ltree
  * Teodor Sigaev <teodor@stack.net>
- * $PostgreSQL: pgsql/contrib/ltree/ltree_op.c,v 1.11 2006/04/27 18:24:35 tgl Exp $
+ * $PostgreSQL: pgsql/contrib/ltree/ltree_op.c,v 1.12 2006/05/30 22:12:13 tgl Exp $
  */
 
 #include "ltree.h"
@@ -12,6 +12,7 @@
 #include "utils/selfuncs.h"
 #include "utils/syscache.h"
 
+PG_MODULE_MAGIC;
 
 /* compare functions */
 PG_FUNCTION_INFO_V1(ltree_cmp);
diff --git a/contrib/pg_buffercache/pg_buffercache_pages.c b/contrib/pg_buffercache/pg_buffercache_pages.c
index a0ae43f77d9..a2811eb001b 100644
--- a/contrib/pg_buffercache/pg_buffercache_pages.c
+++ b/contrib/pg_buffercache/pg_buffercache_pages.c
@@ -3,7 +3,7 @@
  * pg_buffercache_pages.c
  *	  display some contents of the buffer cache
  *
- *	  $PostgreSQL: pgsql/contrib/pg_buffercache/pg_buffercache_pages.c,v 1.6 2005/10/15 02:49:05 momjian Exp $
+ *	  $PostgreSQL: pgsql/contrib/pg_buffercache/pg_buffercache_pages.c,v 1.7 2006/05/30 22:12:13 tgl Exp $
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
@@ -21,6 +21,8 @@ extern DLLIMPORT BufferDesc *BufferDescriptors;
 extern DLLIMPORT volatile uint32 InterruptHoldoffCount;
 #endif
 
+PG_MODULE_MAGIC;
+
 Datum		pg_buffercache_pages(PG_FUNCTION_ARGS);
 
 
diff --git a/contrib/pg_freespacemap/pg_freespacemap.c b/contrib/pg_freespacemap/pg_freespacemap.c
index 5ee85fdddd5..0ab99482ff5 100644
--- a/contrib/pg_freespacemap/pg_freespacemap.c
+++ b/contrib/pg_freespacemap/pg_freespacemap.c
@@ -3,7 +3,7 @@
  * pg_freespacemap.c
  *	  display some contents of the free space relation and page maps.
  *
- *	  $PostgreSQL: pgsql/contrib/pg_freespacemap/pg_freespacemap.c,v 1.5 2006/05/04 20:39:34 tgl Exp $
+ *	  $PostgreSQL: pgsql/contrib/pg_freespacemap/pg_freespacemap.c,v 1.6 2006/05/30 22:12:13 tgl Exp $
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
@@ -24,6 +24,8 @@ extern DLLIMPORT int	MaxFSMRelations;
 extern DLLIMPORT volatile uint32 InterruptHoldoffCount;
 #endif
 
+PG_MODULE_MAGIC;
+
 Datum		pg_freespacemap_pages(PG_FUNCTION_ARGS);
 Datum		pg_freespacemap_relations(PG_FUNCTION_ARGS);
 
diff --git a/contrib/pg_trgm/trgm_op.c b/contrib/pg_trgm/trgm_op.c
index b7043c1b8c8..28690339327 100644
--- a/contrib/pg_trgm/trgm_op.c
+++ b/contrib/pg_trgm/trgm_op.c
@@ -3,6 +3,8 @@
 #include "utils/array.h"
 #include "catalog/pg_type.h"
 
+PG_MODULE_MAGIC;
+
 float4		trgm_limit = 0.3;
 
 PG_FUNCTION_INFO_V1(set_limit);
diff --git a/contrib/pgcrypto/pgcrypto.c b/contrib/pgcrypto/pgcrypto.c
index cc3814aacde..6196a1b4d69 100644
--- a/contrib/pgcrypto/pgcrypto.c
+++ b/contrib/pgcrypto/pgcrypto.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $PostgreSQL: pgsql/contrib/pgcrypto/pgcrypto.c,v 1.20 2005/10/15 02:49:06 momjian Exp $
+ * $PostgreSQL: pgsql/contrib/pgcrypto/pgcrypto.c,v 1.21 2006/05/30 22:12:13 tgl Exp $
  */
 
 #include "postgres.h"
@@ -40,6 +40,8 @@
 #include "px-crypt.h"
 #include "pgcrypto.h"
 
+PG_MODULE_MAGIC;
+
 /* private stuff */
 
 typedef int (*PFN) (const char *name, void **res);
diff --git a/contrib/pgrowlocks/pgrowlocks.c b/contrib/pgrowlocks/pgrowlocks.c
index 1253f7c51ac..d504601ae0c 100644
--- a/contrib/pgrowlocks/pgrowlocks.c
+++ b/contrib/pgrowlocks/pgrowlocks.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL: pgsql/contrib/pgrowlocks/pgrowlocks.c,v 1.2 2006/04/25 00:40:54 ishii Exp $
+ * $PostgreSQL: pgsql/contrib/pgrowlocks/pgrowlocks.c,v 1.3 2006/05/30 22:12:13 tgl Exp $
  *
  * Copyright (c) 2005-2006	Tatsuo Ishii
  *
@@ -37,6 +37,8 @@
 #include "storage/procarray.h"
 #endif
 
+PG_MODULE_MAGIC;
+
 PG_FUNCTION_INFO_V1(pgrowlocks);
 
 extern Datum pgrowlocks(PG_FUNCTION_ARGS);
diff --git a/contrib/pgstattuple/pgstattuple.c b/contrib/pgstattuple/pgstattuple.c
index cb79fadedb4..d4c2c6cdbda 100644
--- a/contrib/pgstattuple/pgstattuple.c
+++ b/contrib/pgstattuple/pgstattuple.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL: pgsql/contrib/pgstattuple/pgstattuple.c,v 1.20 2005/10/15 02:49:06 momjian Exp $
+ * $PostgreSQL: pgsql/contrib/pgstattuple/pgstattuple.c,v 1.21 2006/05/30 22:12:13 tgl Exp $
  *
  * Copyright (c) 2001,2002	Tatsuo Ishii
  *
@@ -32,6 +32,8 @@
 #include "utils/builtins.h"
 
 
+PG_MODULE_MAGIC;
+
 PG_FUNCTION_INFO_V1(pgstattuple);
 PG_FUNCTION_INFO_V1(pgstattuplebyid);
 
diff --git a/contrib/seg/seg.c b/contrib/seg/seg.c
index 0a694a52ddf..47ca1b614a5 100644
--- a/contrib/seg/seg.c
+++ b/contrib/seg/seg.c
@@ -19,6 +19,8 @@
 #define GIST_QUERY_DEBUG
 */
 
+PG_MODULE_MAGIC;
+
 extern int	seg_yyparse();
 extern void seg_yyerror(const char *message);
 extern void seg_scanner_init(const char *str);
diff --git a/contrib/spi/autoinc.c b/contrib/spi/autoinc.c
index bad7c527354..5904f1f4312 100644
--- a/contrib/spi/autoinc.c
+++ b/contrib/spi/autoinc.c
@@ -3,6 +3,8 @@
 #include "commands/trigger.h"	/* -"- and triggers */
 #include "commands/sequence.h"	/* for nextval() */
 
+PG_MODULE_MAGIC;
+
 extern Datum autoinc(PG_FUNCTION_ARGS);
 
 PG_FUNCTION_INFO_V1(autoinc);
diff --git a/contrib/spi/insert_username.c b/contrib/spi/insert_username.c
index 06de9632bd7..73ed17cc1c8 100644
--- a/contrib/spi/insert_username.c
+++ b/contrib/spi/insert_username.c
@@ -1,7 +1,7 @@
 /*
  * insert_username.c
  * $Modified: Thu Oct 16 08:13:42 1997 by brook $
- * $PostgreSQL: pgsql/contrib/spi/insert_username.c,v 1.13 2006/03/11 04:38:30 momjian Exp $
+ * $PostgreSQL: pgsql/contrib/spi/insert_username.c,v 1.14 2006/05/30 22:12:13 tgl Exp $
  *
  * insert user name in response to a trigger
  * usage:  insert_username (column_name)
@@ -11,6 +11,8 @@
 #include "commands/trigger.h"	/* -"- and triggers */
 #include "miscadmin.h"			/* for GetUserName() */
 
+PG_MODULE_MAGIC;
+
 extern Datum insert_username(PG_FUNCTION_ARGS);
 
 PG_FUNCTION_INFO_V1(insert_username);
diff --git a/contrib/spi/moddatetime.c b/contrib/spi/moddatetime.c
index 43ad810793a..ca4e6c0f33e 100644
--- a/contrib/spi/moddatetime.c
+++ b/contrib/spi/moddatetime.c
@@ -1,7 +1,7 @@
 /*
 moddatetime.c
 
-$PostgreSQL: pgsql/contrib/spi/moddatetime.c,v 1.12 2006/03/11 04:38:30 momjian Exp $
+$PostgreSQL: pgsql/contrib/spi/moddatetime.c,v 1.13 2006/05/30 22:12:13 tgl Exp $
 
 What is this?
 It is a function to be called from a trigger for the purpose of updating
@@ -17,6 +17,8 @@ OH, me, I'm Terry Mackintosh <terry@terrym.com>
 #include "executor/spi.h"		/* this is what you need to work with SPI */
 #include "commands/trigger.h"	/* -"- and triggers */
 
+PG_MODULE_MAGIC;
+
 extern Datum moddatetime(PG_FUNCTION_ARGS);
 
 PG_FUNCTION_INFO_V1(moddatetime);
diff --git a/contrib/spi/refint.c b/contrib/spi/refint.c
index 8163f8ebaf4..a060f9effa2 100644
--- a/contrib/spi/refint.c
+++ b/contrib/spi/refint.c
@@ -8,6 +8,8 @@
 #include <ctype.h>
 
 
+PG_MODULE_MAGIC;
+
 extern Datum check_primary_key(PG_FUNCTION_ARGS);
 extern Datum check_foreign_key(PG_FUNCTION_ARGS);
 
diff --git a/contrib/spi/timetravel.c b/contrib/spi/timetravel.c
index 84a11538540..026e4ac8133 100644
--- a/contrib/spi/timetravel.c
+++ b/contrib/spi/timetravel.c
@@ -14,6 +14,8 @@
 
 #define ABSTIMEOID	702			/* it should be in pg_type.h */
 
+PG_MODULE_MAGIC;
+
 /* AbsoluteTime currabstime(void); */
 Datum		timetravel(PG_FUNCTION_ARGS);
 Datum		set_timetravel(PG_FUNCTION_ARGS);
diff --git a/contrib/tablefunc/tablefunc.c b/contrib/tablefunc/tablefunc.c
index 334bd62b249..f5f751e72fe 100644
--- a/contrib/tablefunc/tablefunc.c
+++ b/contrib/tablefunc/tablefunc.c
@@ -42,6 +42,8 @@
 
 #include "tablefunc.h"
 
+PG_MODULE_MAGIC;
+
 static int	load_categories_hash(char *cats_sql, MemoryContext per_query_ctx);
 static Tuplestorestate *get_crosstab_tuplestore(char *sql,
 						int num_categories,
diff --git a/contrib/tsearch2/ts_cfg.c b/contrib/tsearch2/ts_cfg.c
index 3bc39a87378..a71cf97e595 100644
--- a/contrib/tsearch2/ts_cfg.c
+++ b/contrib/tsearch2/ts_cfg.c
@@ -20,6 +20,8 @@
 #include "common.h"
 #include "tsvector.h"
 
+PG_MODULE_MAGIC;
+
 #define IGNORE_LONGLEXEME	1
 
 /*********top interface**********/
diff --git a/contrib/userlock/user_locks.c b/contrib/userlock/user_locks.c
index 53c48bf0a7f..c27dc253d83 100644
--- a/contrib/userlock/user_locks.c
+++ b/contrib/userlock/user_locks.c
@@ -17,6 +17,7 @@
 
 #include "user_locks.h"
 
+PG_MODULE_MAGIC;
 
 #define SET_LOCKTAG_USERLOCK(locktag,id1,id2) \
 	((locktag).locktag_field1 = MyDatabaseId, \
diff --git a/contrib/xml2/xslt_proc.c b/contrib/xml2/xslt_proc.c
index 433030ead96..404aa2a7907 100644
--- a/contrib/xml2/xslt_proc.c
+++ b/contrib/xml2/xslt_proc.c
@@ -21,6 +21,8 @@
 #include <libxslt/xsltutils.h>
 
 
+PG_MODULE_MAGIC;
+
 /* declarations to come from xpath.c */
 
 extern void elog_error(int level, char *explain, int force);
diff --git a/src/backend/utils/mb/conversion_procs/ascii_and_mic/ascii_and_mic.c b/src/backend/utils/mb/conversion_procs/ascii_and_mic/ascii_and_mic.c
index cc1e5fdbf88..85cc1cd62dc 100644
--- a/src/backend/utils/mb/conversion_procs/ascii_and_mic/ascii_and_mic.c
+++ b/src/backend/utils/mb/conversion_procs/ascii_and_mic/ascii_and_mic.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/ascii_and_mic/ascii_and_mic.c,v 1.11 2006/03/05 15:58:47 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/ascii_and_mic/ascii_and_mic.c,v 1.12 2006/05/30 22:12:14 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,6 +15,8 @@
 #include "fmgr.h"
 #include "mb/pg_wchar.h"
 
+PG_MODULE_MAGIC;
+
 PG_FUNCTION_INFO_V1(ascii_to_mic);
 PG_FUNCTION_INFO_V1(mic_to_ascii);
 
diff --git a/src/backend/utils/mb/conversion_procs/cyrillic_and_mic/cyrillic_and_mic.c b/src/backend/utils/mb/conversion_procs/cyrillic_and_mic/cyrillic_and_mic.c
index 57fc2d7a6fa..cf7fda5a1ab 100644
--- a/src/backend/utils/mb/conversion_procs/cyrillic_and_mic/cyrillic_and_mic.c
+++ b/src/backend/utils/mb/conversion_procs/cyrillic_and_mic/cyrillic_and_mic.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/cyrillic_and_mic/cyrillic_and_mic.c,v 1.13 2006/05/21 20:05:19 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/cyrillic_and_mic/cyrillic_and_mic.c,v 1.14 2006/05/30 22:12:14 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,6 +17,8 @@
 
 #define ENCODING_GROWTH_RATE 4
 
+PG_MODULE_MAGIC;
+
 PG_FUNCTION_INFO_V1(koi8r_to_mic);
 PG_FUNCTION_INFO_V1(mic_to_koi8r);
 PG_FUNCTION_INFO_V1(iso_to_mic);
diff --git a/src/backend/utils/mb/conversion_procs/euc_cn_and_mic/euc_cn_and_mic.c b/src/backend/utils/mb/conversion_procs/euc_cn_and_mic/euc_cn_and_mic.c
index 9121ac41801..c6fa9c043f7 100644
--- a/src/backend/utils/mb/conversion_procs/euc_cn_and_mic/euc_cn_and_mic.c
+++ b/src/backend/utils/mb/conversion_procs/euc_cn_and_mic/euc_cn_and_mic.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/euc_cn_and_mic/euc_cn_and_mic.c,v 1.14 2006/05/21 20:05:19 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/euc_cn_and_mic/euc_cn_and_mic.c,v 1.15 2006/05/30 22:12:14 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,6 +15,8 @@
 #include "fmgr.h"
 #include "mb/pg_wchar.h"
 
+PG_MODULE_MAGIC;
+
 PG_FUNCTION_INFO_V1(euc_cn_to_mic);
 PG_FUNCTION_INFO_V1(mic_to_euc_cn);
 
diff --git a/src/backend/utils/mb/conversion_procs/euc_jp_and_sjis/euc_jp_and_sjis.c b/src/backend/utils/mb/conversion_procs/euc_jp_and_sjis/euc_jp_and_sjis.c
index 372dda2c9fe..60104616f6f 100644
--- a/src/backend/utils/mb/conversion_procs/euc_jp_and_sjis/euc_jp_and_sjis.c
+++ b/src/backend/utils/mb/conversion_procs/euc_jp_and_sjis/euc_jp_and_sjis.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/euc_jp_and_sjis/euc_jp_and_sjis.c,v 1.16 2006/05/21 20:05:19 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/euc_jp_and_sjis/euc_jp_and_sjis.c,v 1.17 2006/05/30 22:12:14 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -29,6 +29,8 @@
 
 #define ENCODING_GROWTH_RATE 4
 
+PG_MODULE_MAGIC;
+
 PG_FUNCTION_INFO_V1(euc_jp_to_sjis);
 PG_FUNCTION_INFO_V1(sjis_to_euc_jp);
 PG_FUNCTION_INFO_V1(euc_jp_to_mic);
diff --git a/src/backend/utils/mb/conversion_procs/euc_kr_and_mic/euc_kr_and_mic.c b/src/backend/utils/mb/conversion_procs/euc_kr_and_mic/euc_kr_and_mic.c
index a4248039085..cade50466a1 100644
--- a/src/backend/utils/mb/conversion_procs/euc_kr_and_mic/euc_kr_and_mic.c
+++ b/src/backend/utils/mb/conversion_procs/euc_kr_and_mic/euc_kr_and_mic.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/euc_kr_and_mic/euc_kr_and_mic.c,v 1.14 2006/05/21 20:05:19 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/euc_kr_and_mic/euc_kr_and_mic.c,v 1.15 2006/05/30 22:12:14 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,6 +15,8 @@
 #include "fmgr.h"
 #include "mb/pg_wchar.h"
 
+PG_MODULE_MAGIC;
+
 PG_FUNCTION_INFO_V1(euc_kr_to_mic);
 PG_FUNCTION_INFO_V1(mic_to_euc_kr);
 
diff --git a/src/backend/utils/mb/conversion_procs/euc_tw_and_big5/euc_tw_and_big5.c b/src/backend/utils/mb/conversion_procs/euc_tw_and_big5/euc_tw_and_big5.c
index 28ca458f7cb..0e964c45837 100644
--- a/src/backend/utils/mb/conversion_procs/euc_tw_and_big5/euc_tw_and_big5.c
+++ b/src/backend/utils/mb/conversion_procs/euc_tw_and_big5/euc_tw_and_big5.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/euc_tw_and_big5/euc_tw_and_big5.c,v 1.14 2006/05/21 20:05:20 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/euc_tw_and_big5/euc_tw_and_big5.c,v 1.15 2006/05/30 22:12:14 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,6 +17,8 @@
 
 #define ENCODING_GROWTH_RATE 4
 
+PG_MODULE_MAGIC;
+
 PG_FUNCTION_INFO_V1(euc_tw_to_big5);
 PG_FUNCTION_INFO_V1(big5_to_euc_tw);
 PG_FUNCTION_INFO_V1(euc_tw_to_mic);
diff --git a/src/backend/utils/mb/conversion_procs/latin2_and_win1250/latin2_and_win1250.c b/src/backend/utils/mb/conversion_procs/latin2_and_win1250/latin2_and_win1250.c
index 5563b20ee21..ec4646ab868 100644
--- a/src/backend/utils/mb/conversion_procs/latin2_and_win1250/latin2_and_win1250.c
+++ b/src/backend/utils/mb/conversion_procs/latin2_and_win1250/latin2_and_win1250.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/latin2_and_win1250/latin2_and_win1250.c,v 1.12 2006/05/21 20:05:20 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/latin2_and_win1250/latin2_and_win1250.c,v 1.13 2006/05/30 22:12:14 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,6 +17,8 @@
 
 #define ENCODING_GROWTH_RATE 4
 
+PG_MODULE_MAGIC;
+
 PG_FUNCTION_INFO_V1(latin2_to_mic);
 PG_FUNCTION_INFO_V1(mic_to_latin2);
 PG_FUNCTION_INFO_V1(win1250_to_mic);
diff --git a/src/backend/utils/mb/conversion_procs/latin_and_mic/latin_and_mic.c b/src/backend/utils/mb/conversion_procs/latin_and_mic/latin_and_mic.c
index 14c220c7bb1..075db5359fb 100644
--- a/src/backend/utils/mb/conversion_procs/latin_and_mic/latin_and_mic.c
+++ b/src/backend/utils/mb/conversion_procs/latin_and_mic/latin_and_mic.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/latin_and_mic/latin_and_mic.c,v 1.12 2006/05/21 20:05:20 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/latin_and_mic/latin_and_mic.c,v 1.13 2006/05/30 22:12:14 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,6 +15,8 @@
 #include "fmgr.h"
 #include "mb/pg_wchar.h"
 
+PG_MODULE_MAGIC;
+
 PG_FUNCTION_INFO_V1(latin1_to_mic);
 PG_FUNCTION_INFO_V1(mic_to_latin1);
 PG_FUNCTION_INFO_V1(latin3_to_mic);
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_ascii/utf8_and_ascii.c b/src/backend/utils/mb/conversion_procs/utf8_and_ascii/utf8_and_ascii.c
index ce9639d40d6..e7e52534665 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_ascii/utf8_and_ascii.c
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_ascii/utf8_and_ascii.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_ascii/utf8_and_ascii.c,v 1.13 2006/05/21 20:05:20 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_ascii/utf8_and_ascii.c,v 1.14 2006/05/30 22:12:14 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,6 +15,8 @@
 #include "fmgr.h"
 #include "mb/pg_wchar.h"
 
+PG_MODULE_MAGIC;
+
 PG_FUNCTION_INFO_V1(ascii_to_utf8);
 PG_FUNCTION_INFO_V1(utf8_to_ascii);
 
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_big5/utf8_and_big5.c b/src/backend/utils/mb/conversion_procs/utf8_and_big5/utf8_and_big5.c
index 00fd62c619b..adf06632f33 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_big5/utf8_and_big5.c
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_big5/utf8_and_big5.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_big5/utf8_and_big5.c,v 1.13 2006/05/21 20:05:20 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_big5/utf8_and_big5.c,v 1.14 2006/05/30 22:12:14 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,6 +17,8 @@
 #include "../../Unicode/big5_to_utf8.map"
 #include "../../Unicode/utf8_to_big5.map"
 
+PG_MODULE_MAGIC;
+
 PG_FUNCTION_INFO_V1(big5_to_utf8);
 PG_FUNCTION_INFO_V1(utf8_to_big5);
 
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/utf8_and_cyrillic.c b/src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/utf8_and_cyrillic.c
index 0854e0dff03..b9f6c46c22b 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/utf8_and_cyrillic.c
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/utf8_and_cyrillic.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/utf8_and_cyrillic.c,v 1.15 2006/05/21 20:05:20 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/utf8_and_cyrillic.c,v 1.16 2006/05/30 22:12:15 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,6 +17,8 @@
 #include "../../Unicode/utf8_to_koi8r.map"
 #include "../../Unicode/koi8r_to_utf8.map"
 
+PG_MODULE_MAGIC;
+
 PG_FUNCTION_INFO_V1(utf8_to_koi8r);
 PG_FUNCTION_INFO_V1(koi8r_to_utf8);
 
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_euc_cn/utf8_and_euc_cn.c b/src/backend/utils/mb/conversion_procs/utf8_and_euc_cn/utf8_and_euc_cn.c
index 23a1a5060ad..51214334575 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_euc_cn/utf8_and_euc_cn.c
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_euc_cn/utf8_and_euc_cn.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_euc_cn/utf8_and_euc_cn.c,v 1.14 2006/05/21 20:05:20 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_euc_cn/utf8_and_euc_cn.c,v 1.15 2006/05/30 22:12:15 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,6 +17,8 @@
 #include "../../Unicode/euc_cn_to_utf8.map"
 #include "../../Unicode/utf8_to_euc_cn.map"
 
+PG_MODULE_MAGIC;
+
 PG_FUNCTION_INFO_V1(euc_cn_to_utf8);
 PG_FUNCTION_INFO_V1(utf8_to_euc_cn);
 
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_euc_jp/utf8_and_euc_jp.c b/src/backend/utils/mb/conversion_procs/utf8_and_euc_jp/utf8_and_euc_jp.c
index 11bcd7ebc2e..1de5bc948b4 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_euc_jp/utf8_and_euc_jp.c
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_euc_jp/utf8_and_euc_jp.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_euc_jp/utf8_and_euc_jp.c,v 1.14 2006/05/21 20:05:20 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_euc_jp/utf8_and_euc_jp.c,v 1.15 2006/05/30 22:12:15 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,6 +17,8 @@
 #include "../../Unicode/euc_jp_to_utf8.map"
 #include "../../Unicode/utf8_to_euc_jp.map"
 
+PG_MODULE_MAGIC;
+
 PG_FUNCTION_INFO_V1(euc_jp_to_utf8);
 PG_FUNCTION_INFO_V1(utf8_to_euc_jp);
 
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_euc_kr/utf8_and_euc_kr.c b/src/backend/utils/mb/conversion_procs/utf8_and_euc_kr/utf8_and_euc_kr.c
index 689584312c2..31b8fca8f15 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_euc_kr/utf8_and_euc_kr.c
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_euc_kr/utf8_and_euc_kr.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_euc_kr/utf8_and_euc_kr.c,v 1.14 2006/05/21 20:05:20 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_euc_kr/utf8_and_euc_kr.c,v 1.15 2006/05/30 22:12:15 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,6 +17,8 @@
 #include "../../Unicode/euc_kr_to_utf8.map"
 #include "../../Unicode/utf8_to_euc_kr.map"
 
+PG_MODULE_MAGIC;
+
 PG_FUNCTION_INFO_V1(euc_kr_to_utf8);
 PG_FUNCTION_INFO_V1(utf8_to_euc_kr);
 
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_euc_tw/utf8_and_euc_tw.c b/src/backend/utils/mb/conversion_procs/utf8_and_euc_tw/utf8_and_euc_tw.c
index a26139dd6af..ced10925ad1 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_euc_tw/utf8_and_euc_tw.c
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_euc_tw/utf8_and_euc_tw.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_euc_tw/utf8_and_euc_tw.c,v 1.14 2006/05/21 20:05:20 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_euc_tw/utf8_and_euc_tw.c,v 1.15 2006/05/30 22:12:15 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,6 +17,8 @@
 #include "../../Unicode/euc_tw_to_utf8.map"
 #include "../../Unicode/utf8_to_euc_tw.map"
 
+PG_MODULE_MAGIC;
+
 PG_FUNCTION_INFO_V1(euc_tw_to_utf8);
 PG_FUNCTION_INFO_V1(utf8_to_euc_tw);
 
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_gb18030/utf8_and_gb18030.c b/src/backend/utils/mb/conversion_procs/utf8_and_gb18030/utf8_and_gb18030.c
index f2587b08159..d65f64f1efd 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_gb18030/utf8_and_gb18030.c
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_gb18030/utf8_and_gb18030.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_gb18030/utf8_and_gb18030.c,v 1.14 2006/05/21 20:05:20 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_gb18030/utf8_and_gb18030.c,v 1.15 2006/05/30 22:12:15 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,6 +17,8 @@
 #include "../../Unicode/gb18030_to_utf8.map"
 #include "../../Unicode/utf8_to_gb18030.map"
 
+PG_MODULE_MAGIC;
+
 PG_FUNCTION_INFO_V1(gb18030_to_utf8);
 PG_FUNCTION_INFO_V1(utf8_to_gb18030);
 
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_gbk/utf8_and_gbk.c b/src/backend/utils/mb/conversion_procs/utf8_and_gbk/utf8_and_gbk.c
index be7a283f916..ed8181d098e 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_gbk/utf8_and_gbk.c
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_gbk/utf8_and_gbk.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_gbk/utf8_and_gbk.c,v 1.13 2006/05/21 20:05:20 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_gbk/utf8_and_gbk.c,v 1.14 2006/05/30 22:12:15 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,6 +17,8 @@
 #include "../../Unicode/gbk_to_utf8.map"
 #include "../../Unicode/utf8_to_gbk.map"
 
+PG_MODULE_MAGIC;
+
 PG_FUNCTION_INFO_V1(gbk_to_utf8);
 PG_FUNCTION_INFO_V1(utf8_to_gbk);
 
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c b/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c
index 6de77c14aa1..ed8b7766b0d 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c,v 1.19 2006/05/21 20:05:20 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c,v 1.20 2006/05/30 22:12:15 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -41,6 +41,8 @@
 #include "../../Unicode/iso8859_15_to_utf8.map"
 #include "../../Unicode/iso8859_16_to_utf8.map"
 
+PG_MODULE_MAGIC;
+
 PG_FUNCTION_INFO_V1(iso8859_to_utf8);
 PG_FUNCTION_INFO_V1(utf8_to_iso8859);
 
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_iso8859_1/utf8_and_iso8859_1.c b/src/backend/utils/mb/conversion_procs/utf8_and_iso8859_1/utf8_and_iso8859_1.c
index 038f6781141..627573b0f52 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_iso8859_1/utf8_and_iso8859_1.c
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_iso8859_1/utf8_and_iso8859_1.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_iso8859_1/utf8_and_iso8859_1.c,v 1.16 2006/05/21 20:05:20 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_iso8859_1/utf8_and_iso8859_1.c,v 1.17 2006/05/30 22:12:15 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,6 +15,8 @@
 #include "fmgr.h"
 #include "mb/pg_wchar.h"
 
+PG_MODULE_MAGIC;
+
 PG_FUNCTION_INFO_V1(iso8859_1_to_utf8);
 PG_FUNCTION_INFO_V1(utf8_to_iso8859_1);
 
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_johab/utf8_and_johab.c b/src/backend/utils/mb/conversion_procs/utf8_and_johab/utf8_and_johab.c
index 7223ecef8bd..5f21c6e16b7 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_johab/utf8_and_johab.c
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_johab/utf8_and_johab.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_johab/utf8_and_johab.c,v 1.14 2006/05/21 20:05:21 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_johab/utf8_and_johab.c,v 1.15 2006/05/30 22:12:15 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,6 +17,8 @@
 #include "../../Unicode/johab_to_utf8.map"
 #include "../../Unicode/utf8_to_johab.map"
 
+PG_MODULE_MAGIC;
+
 PG_FUNCTION_INFO_V1(johab_to_utf8);
 PG_FUNCTION_INFO_V1(utf8_to_johab);
 
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_sjis/utf8_and_sjis.c b/src/backend/utils/mb/conversion_procs/utf8_and_sjis/utf8_and_sjis.c
index 12f9f43b5e7..061b3a9a2cb 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_sjis/utf8_and_sjis.c
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_sjis/utf8_and_sjis.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_sjis/utf8_and_sjis.c,v 1.13 2006/05/21 20:05:21 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_sjis/utf8_and_sjis.c,v 1.14 2006/05/30 22:12:15 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,6 +17,8 @@
 #include "../../Unicode/sjis_to_utf8.map"
 #include "../../Unicode/utf8_to_sjis.map"
 
+PG_MODULE_MAGIC;
+
 PG_FUNCTION_INFO_V1(sjis_to_utf8);
 PG_FUNCTION_INFO_V1(utf8_to_sjis);
 
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_uhc/utf8_and_uhc.c b/src/backend/utils/mb/conversion_procs/utf8_and_uhc/utf8_and_uhc.c
index 860b475b8a2..bc4df2f4faa 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_uhc/utf8_and_uhc.c
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_uhc/utf8_and_uhc.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_uhc/utf8_and_uhc.c,v 1.13 2006/05/21 20:05:21 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_uhc/utf8_and_uhc.c,v 1.14 2006/05/30 22:12:15 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,6 +17,8 @@
 #include "../../Unicode/uhc_to_utf8.map"
 #include "../../Unicode/utf8_to_uhc.map"
 
+PG_MODULE_MAGIC;
+
 PG_FUNCTION_INFO_V1(uhc_to_utf8);
 PG_FUNCTION_INFO_V1(utf8_to_uhc);
 
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c b/src/backend/utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c
index 932b164fac7..0755cf3a17c 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c,v 1.3 2006/05/21 20:05:21 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c,v 1.4 2006/05/30 22:12:15 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -37,6 +37,8 @@
 #include "../../Unicode/win1257_to_utf8.map"
 #include "../../Unicode/win1258_to_utf8.map"
 
+PG_MODULE_MAGIC;
+
 PG_FUNCTION_INFO_V1(win_to_utf8);
 PG_FUNCTION_INFO_V1(utf8_to_win);
 
diff --git a/src/pl/plperl/plperl.c b/src/pl/plperl/plperl.c
index 9b03834d408..612d4261f69 100644
--- a/src/pl/plperl/plperl.c
+++ b/src/pl/plperl/plperl.c
@@ -1,7 +1,7 @@
 /**********************************************************************
  * plperl.c - perl as a procedural language for PostgreSQL
  *
- *	  $PostgreSQL: pgsql/src/pl/plperl/plperl.c,v 1.110 2006/05/29 13:51:23 adunstan Exp $
+ *	  $PostgreSQL: pgsql/src/pl/plperl/plperl.c,v 1.111 2006/05/30 22:12:15 tgl Exp $
  *
  **********************************************************************/
 
@@ -33,6 +33,8 @@ extern DLLIMPORT bool check_function_bodies;
 /* perl stuff */
 #include "plperl.h"
 
+PG_MODULE_MAGIC;
+
 /**********************************************************************
  * The information we cache about loaded procedures
  **********************************************************************/
diff --git a/src/pl/plpgsql/src/pl_handler.c b/src/pl/plpgsql/src/pl_handler.c
index 581b97252e2..d8eb22f995e 100644
--- a/src/pl/plpgsql/src/pl_handler.c
+++ b/src/pl/plpgsql/src/pl_handler.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_handler.c,v 1.28 2006/03/09 21:29:38 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_handler.c,v 1.29 2006/05/30 22:12:16 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -26,6 +26,8 @@
 
 extern DLLIMPORT bool check_function_bodies;
 
+PG_MODULE_MAGIC;
+
 static bool plpgsql_firstcall = true;
 
 static void plpgsql_init_all(void);
diff --git a/src/pl/plpython/plpython.c b/src/pl/plpython/plpython.c
index 7ac3f89c146..1aedc0c7625 100644
--- a/src/pl/plpython/plpython.c
+++ b/src/pl/plpython/plpython.c
@@ -1,7 +1,7 @@
 /**********************************************************************
  * plpython.c - python as a procedural language for PostgreSQL
  *
- *	$PostgreSQL: pgsql/src/pl/plpython/plpython.c,v 1.80 2006/05/26 19:23:09 adunstan Exp $
+ *	$PostgreSQL: pgsql/src/pl/plpython/plpython.c,v 1.81 2006/05/30 22:12:16 tgl Exp $
  *
  *********************************************************************
  */
@@ -32,6 +32,8 @@
 #include <compile.h>
 #include <eval.h>
 
+PG_MODULE_MAGIC;
+
 /* convert Postgresql Datum or tuple into a PyObject.
  * input to Python.  Tuples are converted to dictionary
  * objects.
diff --git a/src/pl/tcl/pltcl.c b/src/pl/tcl/pltcl.c
index 6705fd7ac6e..198b11c77e9 100644
--- a/src/pl/tcl/pltcl.c
+++ b/src/pl/tcl/pltcl.c
@@ -2,7 +2,7 @@
  * pltcl.c		- PostgreSQL support for Tcl as
  *				  procedural language (PL)
  *
- *	  $PostgreSQL: pgsql/src/pl/tcl/pltcl.c,v 1.103 2006/05/27 20:24:16 adunstan Exp $
+ *	  $PostgreSQL: pgsql/src/pl/tcl/pltcl.c,v 1.104 2006/05/30 22:12:16 tgl Exp $
  *
  **********************************************************************/
 
@@ -67,6 +67,7 @@ utf_e2u(unsigned char *src)
 #define  UTF_E2U(x)  (x)
 #endif   /* PLTCL_UTF */
 
+PG_MODULE_MAGIC;
 
 /**********************************************************************
  * The information we cache about loaded procedures
diff --git a/src/tutorial/complex.c b/src/tutorial/complex.c
index d6fdc1eed97..5b7da346121 100644
--- a/src/tutorial/complex.c
+++ b/src/tutorial/complex.c
@@ -10,6 +10,8 @@
 #include "libpq/pqformat.h"		/* needed for send/recv functions */
 
 
+PG_MODULE_MAGIC;
+
 typedef struct Complex
 {
 	double		x;
diff --git a/src/tutorial/funcs_new.c b/src/tutorial/funcs_new.c
index 9a490340637..f5507a82847 100644
--- a/src/tutorial/funcs_new.c
+++ b/src/tutorial/funcs_new.c
@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/src/tutorial/funcs_new.c,v 1.7 2006/03/11 04:38:42 momjian Exp $ */
+/* $PostgreSQL: pgsql/src/tutorial/funcs_new.c,v 1.8 2006/05/30 22:12:16 tgl Exp $ */
 
 /******************************************************************************
   These are user-defined functions that can be bound to a Postgres backend
@@ -18,6 +18,8 @@
 #include "utils/geo_decls.h"	/* for point type */
 
 
+PG_MODULE_MAGIC;
+
 /* These prototypes just prevent possible warnings from gcc. */
 
 Datum		add_one(PG_FUNCTION_ARGS);