diff --git a/contrib/dict_int/dict_int.c b/contrib/dict_int/dict_int.c
index 79067a86f088650c301e3a2ba9c1fcfe4b7e32b1..be24aa7b22d6f83cd1bc5b5c2b56210c0319a6a8 100644
--- a/contrib/dict_int/dict_int.c
+++ b/contrib/dict_int/dict_int.c
@@ -17,7 +17,6 @@
 
 PG_MODULE_MAGIC;
 
-
 typedef struct
 {
 	int			maxlen;
diff --git a/contrib/earthdistance/earthdistance.c b/contrib/earthdistance/earthdistance.c
index 6bbebdfd1a31e4b91cc824c727a9884a03f1ebd8..861b1663739bf7f9a4265ccf05bf499397aa3471 100644
--- a/contrib/earthdistance/earthdistance.c
+++ b/contrib/earthdistance/earthdistance.c
@@ -10,7 +10,6 @@
 #define M_PI 3.14159265358979323846
 #endif
 
-
 PG_MODULE_MAGIC;
 
 /* Earth's radius is in statute miles. */
diff --git a/contrib/intarray/_int_op.c b/contrib/intarray/_int_op.c
index 70849be57f4fc6df45efd5833824b2cec5532989..537174175b2e37914eadf47a83b2c2e3d117bd8e 100644
--- a/contrib/intarray/_int_op.c
+++ b/contrib/intarray/_int_op.c
@@ -6,7 +6,6 @@
 
 #include "_int.h"
 
-
 PG_MODULE_MAGIC;
 
 PG_FUNCTION_INFO_V1(_int_different);
diff --git a/contrib/lo/lo.c b/contrib/lo/lo.c
index 4dee64724d6e7ffb38389374fe85a2a2e764f8b5..953659305fbde7b13c4be23dfbd9aea1b6a3c93e 100644
--- a/contrib/lo/lo.c
+++ b/contrib/lo/lo.c
@@ -12,7 +12,6 @@
 #include "libpq/be-fsstubs.h"
 #include "utils/rel.h"
 
-
 PG_MODULE_MAGIC;
 
 #define atooid(x)  ((Oid) strtoul((x), NULL, 10))
diff --git a/contrib/passwordcheck/passwordcheck.c b/contrib/passwordcheck/passwordcheck.c
index 405896d40a9822b2c7543a08127013661608c2d2..e4ad3a3892d5f38066e8a1991cfd7526e579f4f4 100644
--- a/contrib/passwordcheck/passwordcheck.c
+++ b/contrib/passwordcheck/passwordcheck.c
@@ -24,7 +24,6 @@
 #include "fmgr.h"
 #include "libpq/md5.h"
 
-
 PG_MODULE_MAGIC;
 
 /* passwords shorter than this will be rejected */
diff --git a/contrib/pg_buffercache/pg_buffercache_pages.c b/contrib/pg_buffercache/pg_buffercache_pages.c
index f39fe255db63e39a242ac94a921ff02b82b2fec5..b205683bffcce95d0f735b42bc1c0947a02480cc 100644
--- a/contrib/pg_buffercache/pg_buffercache_pages.c
+++ b/contrib/pg_buffercache/pg_buffercache_pages.c
@@ -19,7 +19,6 @@
 
 PG_MODULE_MAGIC;
 
-
 /*
  * Record structure holding the to be exposed cache data.
  */
diff --git a/contrib/pg_freespacemap/pg_freespacemap.c b/contrib/pg_freespacemap/pg_freespacemap.c
index 7805345add15d78b8205a65f88ca3fe3d089f190..7d939a7d207c6fe38e8acea6a118f9855946ef46 100644
--- a/contrib/pg_freespacemap/pg_freespacemap.c
+++ b/contrib/pg_freespacemap/pg_freespacemap.c
@@ -11,7 +11,6 @@
 #include "funcapi.h"
 #include "storage/freespace.h"
 
-
 PG_MODULE_MAGIC;
 
 /*
diff --git a/contrib/pg_stat_statements/pg_stat_statements.c b/contrib/pg_stat_statements/pg_stat_statements.c
index 7c2216a7eedbf73b72776ff621db11df21ded3be..6beced0e7d93e0bb9b4a6e0e871de0c1ec34059a 100644
--- a/contrib/pg_stat_statements/pg_stat_statements.c
+++ b/contrib/pg_stat_statements/pg_stat_statements.c
@@ -76,7 +76,6 @@
 #include "utils/builtins.h"
 #include "utils/memutils.h"
 
-
 PG_MODULE_MAGIC;
 
 /* Location of permanent stats file (valid when database is shut down) */
diff --git a/contrib/pg_trgm/trgm_op.c b/contrib/pg_trgm/trgm_op.c
index c385e09edda15e40321f868de04a4ad46086509f..df15b52b4a1a5610c9e50b2b3a3efeae387f5069 100644
--- a/contrib/pg_trgm/trgm_op.c
+++ b/contrib/pg_trgm/trgm_op.c
@@ -11,7 +11,6 @@
 #include "tsearch/ts_locale.h"
 #include "utils/memutils.h"
 
-
 PG_MODULE_MAGIC;
 
 float4		trgm_limit = 0.3f;
diff --git a/contrib/pgrowlocks/pgrowlocks.c b/contrib/pgrowlocks/pgrowlocks.c
index 15d97047525c88b7198cdd8912715b8377afb9a4..7b8c9fbb326dfdd0bd9edb0ee79a15a2c987b491 100644
--- a/contrib/pgrowlocks/pgrowlocks.c
+++ b/contrib/pgrowlocks/pgrowlocks.c
@@ -38,7 +38,6 @@
 #include "utils/snapmgr.h"
 #include "utils/tqual.h"
 
-
 PG_MODULE_MAGIC;
 
 PG_FUNCTION_INFO_V1(pgrowlocks);
diff --git a/contrib/pgstattuple/pgstattuple.c b/contrib/pgstattuple/pgstattuple.c
index 10077483d3587544d214df9034c672905e9280c0..c3a8b1d424ab30073169b017d3816190b7516d2a 100644
--- a/contrib/pgstattuple/pgstattuple.c
+++ b/contrib/pgstattuple/pgstattuple.c
@@ -36,7 +36,6 @@
 #include "utils/builtins.h"
 #include "utils/tqual.h"
 
-
 PG_MODULE_MAGIC;
 
 PG_FUNCTION_INFO_V1(pgstattuple);
diff --git a/contrib/postgres_fdw/postgres_fdw.c b/contrib/postgres_fdw/postgres_fdw.c
index 7dd43a993798467e08a8e187f92b0951ab5960bf..56374905f5b26ed407699795ccd56619527d379a 100644
--- a/contrib/postgres_fdw/postgres_fdw.c
+++ b/contrib/postgres_fdw/postgres_fdw.c
@@ -37,7 +37,6 @@
 #include "utils/lsyscache.h"
 #include "utils/memutils.h"
 
-
 PG_MODULE_MAGIC;
 
 /* Default CPU cost to start up a foreign query. */
diff --git a/contrib/sslinfo/sslinfo.c b/contrib/sslinfo/sslinfo.c
index db491a4bc806b1278220ce513b18931f74bc92c7..641c3f0c845641f3dcc31e0bf4b9b7f765d97b96 100644
--- a/contrib/sslinfo/sslinfo.c
+++ b/contrib/sslinfo/sslinfo.c
@@ -18,10 +18,8 @@
 #include <openssl/x509.h>
 #include <openssl/asn1.h>
 
-
 PG_MODULE_MAGIC;
 
-
 static Datum X509_NAME_field_to_text(X509_NAME *name, text *fieldName);
 static Datum X509_NAME_to_text(X509_NAME *name);
 static Datum ASN1_STRING_to_text(ASN1_STRING *str);
diff --git a/contrib/tcn/tcn.c b/contrib/tcn/tcn.c
index ba34f9b1fadfb7bcced83050a800eb10ebb70f17..7ad2898308ff720c65b46efd2d8962413c1bd179 100644
--- a/contrib/tcn/tcn.c
+++ b/contrib/tcn/tcn.c
@@ -23,10 +23,8 @@
 #include "utils/rel.h"
 #include "utils/syscache.h"
 
-
 PG_MODULE_MAGIC;
 
-
 /*
  * Copy from s (for source) to r (for result), wrapping with q (quote)
  * characters and doubling any quote characters found.
diff --git a/contrib/test_decoding/test_decoding.c b/contrib/test_decoding/test_decoding.c
index 5ce052b5c61409f3dc0574d8d45c6642bee8a4e6..6edc5fcd47ad78c62a18cf798a62cb22972c2fa3 100644
--- a/contrib/test_decoding/test_decoding.c
+++ b/contrib/test_decoding/test_decoding.c
@@ -30,7 +30,6 @@
 #include "utils/syscache.h"
 #include "utils/typcache.h"
 
-
 PG_MODULE_MAGIC;
 
 /* These must be available to pg_dlsym() */
diff --git a/contrib/test_parser/test_parser.c b/contrib/test_parser/test_parser.c
index c41d1eb201ca69969d165e0453f35b77f0cd4158..cbf77966ae57a1528399a6e56b735d76fae6ccc5 100644
--- a/contrib/test_parser/test_parser.c
+++ b/contrib/test_parser/test_parser.c
@@ -16,7 +16,6 @@
 
 PG_MODULE_MAGIC;
 
-
 /*
  * types
  */
diff --git a/contrib/test_shm_mq/test.c b/contrib/test_shm_mq/test.c
index 8750bae8dbf448ee65e4dd594dbc703d10c0e527..95d620f7569ce56157d35da986f08066a25a2437 100644
--- a/contrib/test_shm_mq/test.c
+++ b/contrib/test_shm_mq/test.c
@@ -18,7 +18,9 @@
 
 #include "test_shm_mq.h"
 
-PG_MODULE_MAGIC; PG_FUNCTION_INFO_V1(test_shm_mq);
+PG_MODULE_MAGIC;
+
+PG_FUNCTION_INFO_V1(test_shm_mq);
 PG_FUNCTION_INFO_V1(test_shm_mq_pipelined);
 
 void		_PG_init(void);
diff --git a/contrib/uuid-ossp/uuid-ossp.c b/contrib/uuid-ossp/uuid-ossp.c
index 9e9905bfdefb7a060bfd24fea3583e11a2379e9c..db0c6a97aa3efc7ab120f822bd7a9ebda997300a 100644
--- a/contrib/uuid-ossp/uuid-ossp.c
+++ b/contrib/uuid-ossp/uuid-ossp.c
@@ -108,10 +108,8 @@ do { \
 
 #endif   /* !HAVE_UUID_OSSP */
 
-
 PG_MODULE_MAGIC;
 
-
 PG_FUNCTION_INFO_V1(uuid_nil);
 PG_FUNCTION_INFO_V1(uuid_ns_dns);
 PG_FUNCTION_INFO_V1(uuid_ns_url);
diff --git a/contrib/xml2/xpath.c b/contrib/xml2/xpath.c
index a8b159ebff7bbb30562c06751aa7c6779b38d37d..f57b81302f3b7efed08ce8ef216fff11b78328d2 100644
--- a/contrib/xml2/xpath.c
+++ b/contrib/xml2/xpath.c
@@ -23,7 +23,6 @@
 #include <libxml/xmlerror.h>
 #include <libxml/parserInternals.h>
 
-
 PG_MODULE_MAGIC;
 
 /* exported for use by xslt_proc.c */
diff --git a/src/backend/snowball/dict_snowball.c b/src/backend/snowball/dict_snowball.c
index 37d2966359fc3e836d45f5360f88eff5a27315fe..545c98c9c62df4ba50b0cedefe361bd00f476819 100644
--- a/src/backend/snowball/dict_snowball.c
+++ b/src/backend/snowball/dict_snowball.c
@@ -58,7 +58,6 @@
 #include "snowball/libstemmer/stem_UTF_8_swedish.h"
 #include "snowball/libstemmer/stem_UTF_8_turkish.h"
 
-
 PG_MODULE_MAGIC;
 
 PG_FUNCTION_INFO_V1(dsnowball_init);
diff --git a/src/pl/plperl/plperl.c b/src/pl/plperl/plperl.c
index d57189fe1e4ffa0dddb2401726daae1ac43e5c4e..1d025d465332f72d26649489213ffa9c103831d8 100644
--- a/src/pl/plperl/plperl.c
+++ b/src/pl/plperl/plperl.c
@@ -60,7 +60,6 @@ EXTERN_C void boot_PostgreSQL__InServer__SPI(pTHX_ CV *cv);
 
 PG_MODULE_MAGIC;
 
-
 /**********************************************************************
  * Information associated with a Perl interpreter.  We have one interpreter
  * that is used for all plperlu (untrusted) functions.  For plperl (trusted)
diff --git a/src/tutorial/complex.c b/src/tutorial/complex.c
index 922784004ea69dc382b17cfd5da3b462cf813831..a263110cd2d36d79dd200f52799c2ab714655e65 100644
--- a/src/tutorial/complex.c
+++ b/src/tutorial/complex.c
@@ -12,7 +12,6 @@
 #include "fmgr.h"
 #include "libpq/pqformat.h"		/* needed for send/recv functions */
 
-
 PG_MODULE_MAGIC;
 
 typedef struct Complex
diff --git a/src/tutorial/funcs.c b/src/tutorial/funcs.c
index e581275856620c4a2bb1007594d223654dea952e..61ad1417a869496e0af397fe20f192209c82569a 100644
--- a/src/tutorial/funcs.c
+++ b/src/tutorial/funcs.c
@@ -18,7 +18,6 @@
 
 PG_MODULE_MAGIC;
 
-
 /* These prototypes just prevent possible warnings from gcc. */
 
 int			add_one(int arg);
diff --git a/src/tutorial/funcs_new.c b/src/tutorial/funcs_new.c
index c8ef458226b19a2e28179caa1b076a60faf2d960..abe409b8591e436b454de4f40886476e5cd733f0 100644
--- a/src/tutorial/funcs_new.c
+++ b/src/tutorial/funcs_new.c
@@ -16,7 +16,6 @@
 #include "executor/executor.h"	/* for GetAttributeByName() */
 #include "utils/geo_decls.h"	/* for point type */
 
-
 PG_MODULE_MAGIC;
 
 /* These prototypes just prevent possible warnings from gcc. */