Magic blocks don't do us any good unless we use 'em ... so install one

in every shared library.

58 files changed, 113 insertions, 0 deletions

diff --git a/contrib/btree_gist/btree_gist.c b/contrib/btree_gist/btree_gist.c
index a64a6cb7c1..c5c7bb88bb 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 7af6703b77..e8ad199711 100644
--- a/contrib/chkpass/chkpass.c
+++ b/contrib/chkpass/chkpass.c
@@ -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 b3089200e5..e61db4d28b 100644
--- a/contrib/cube/cube.c
+++ b/contrib/cube/cube.c
@@ -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 4f9ffdcba5..15c0e51ec2 100644
--- a/contrib/dblink/dblink.c
+++ b/contrib/dblink/dblink.c
@@ -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 06b4c80a03..789a08a98f 100644
--- a/contrib/dbmirror/pending.c
+++ b/contrib/dbmirror/pending.c
@@ -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 fdbeba1b78..72449c89b2 100644
--- a/contrib/earthdistance/earthdistance.c
+++ b/contrib/earthdistance/earthdistance.c
@@ -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 73518323e6..533b47b55e 100644
--- a/contrib/fulltextindex/fti.c
+++ b/contrib/fulltextindex/fti.c
@@ -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 a0b5d08314..376c1107e1 100644
--- a/contrib/fuzzystrmatch/fuzzystrmatch.c
+++ b/contrib/fuzzystrmatch/fuzzystrmatch.c
@@ -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 acca4e8bb1..7acc53dc5c 100644
--- a/contrib/intagg/int_aggregate.c
+++ b/contrib/intagg/int_aggregate.c
@@ -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 036c357fb0..40650b6af8 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 b5ed9b6830..de7db5bffa 100644
--- a/contrib/isbn_issn/isbn_issn.c
+++ b/contrib/isbn_issn/isbn_issn.c
@@ -6,6 +6,10 @@
 
 #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 7e815fca9e..a1fb0a8777 100644
--- a/contrib/lo/lo.c
+++ b/contrib/lo/lo.c
@@ -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 f245fef356..3661c8d71c 100644
--- a/contrib/ltree/ltree_op.c
+++ b/contrib/ltree/ltree_op.c
@@ -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 22bb8e537b..d4362443f9 100644
--- a/contrib/pg_buffercache/pg_buffercache_pages.c
+++ b/contrib/pg_buffercache/pg_buffercache_pages.c
@@ -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 3319be5a88..6247cb0ae3 100644
--- a/contrib/pg_freespacemap/pg_freespacemap.c
+++ b/contrib/pg_freespacemap/pg_freespacemap.c
@@ -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 b7043c1b8c..2869033932 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 6ac59f12fa..43454845cc 100644
--- a/contrib/pgcrypto/pgcrypto.c
+++ b/contrib/pgcrypto/pgcrypto.c
@@ -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 68db8255ff..d625da9a5c 100644
--- a/contrib/pgrowlocks/pgrowlocks.c
+++ b/contrib/pgrowlocks/pgrowlocks.c
@@ -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 3787874bfd..68fd8f6ede 100644
--- a/contrib/pgstattuple/pgstattuple.c
+++ b/contrib/pgstattuple/pgstattuple.c
@@ -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 0a694a52dd..47ca1b614a 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 bad7c52735..5904f1f431 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 785e0aface..dc9a7bdccc 100644
--- a/contrib/spi/insert_username.c
+++ b/contrib/spi/insert_username.c
@@ -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 28bc934ea1..f5cf8a2c0b 100644
--- a/contrib/spi/moddatetime.c
+++ b/contrib/spi/moddatetime.c
@@ -17,6 +17,8 @@ OH, me, I'm Terry Mackintosh <[email protected]>
 #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 8163f8ebaf..a060f9effa 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 84a1153854..026e4ac813 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 334bd62b24..f5f751e72f 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 3bc39a8737..a71cf97e59 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 53c48bf0a7..c27dc253d8 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 433030ead9..404aa2a790 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 293b41f45c..f0f17259be 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
@@ -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 8e56d5aa62..0430c696c7 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
@@ -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 1be8a4c2ab..60b7cbfa87 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
@@ -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 9e84ae510b..5e4931db28 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
@@ -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 4c98f12066..ada19aa467 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
@@ -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 0bccb4e5f8..83c0d24eab 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
@@ -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 7391c98597..047c6aa73f 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
@@ -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 1d4035b8e8..6b2c3c5eed 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
@@ -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 ee534ba05e..2f72f89a54 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
@@ -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 95a809a320..6d7e25e3ff 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
@@ -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 d6e2dc5fe7..68f62080fe 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
@@ -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 c73a9f3bbe..01fdbb13f8 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
@@ -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 42e3fcccfd..4c9be5f287 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
@@ -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 ed4806fc3c..27d89b1bc4 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
@@ -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 bb8755ece7..ca68befda7 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
@@ -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 664ea4c9bd..e0033306ac 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
@@ -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 db28bfd1a1..115219c09d 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
@@ -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 871fa3cef9..0358cc4282 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
@@ -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 7b55514cab..f9fbc86644 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
@@ -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 56bf484dca..8185dd8f74 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
@@ -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 ffd5e39a44..b64596a0e9 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
@@ -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 f1b69f40d6..2eafe4f88e 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
@@ -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 8ea01bcde1..19dc24cac1 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
@@ -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 6756684e4c..fb207ee98c 100644
--- a/src/pl/plperl/plperl.c
+++ b/src/pl/plperl/plperl.c
@@ -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 1dbfc79045..2da186f01b 100644
--- a/src/pl/plpgsql/src/pl_handler.c
+++ b/src/pl/plpgsql/src/pl_handler.c
@@ -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 cc628df560..e533d0257e 100644
--- a/src/pl/plpython/plpython.c
+++ b/src/pl/plpython/plpython.c
@@ -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 434ea92f19..249aa96e59 100644
--- a/src/pl/tcl/pltcl.c
+++ b/src/pl/tcl/pltcl.c
@@ -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 d6fdc1eed9..5b7da34612 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 8cde50894e..3ab83c92bd 100644
--- a/src/tutorial/funcs_new.c
+++ b/src/tutorial/funcs_new.c
@@ -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);