diff --git a/contrib/amcheck/verify_common.c b/contrib/amcheck/verify_common.c
index 54ce901716b..2301b843494 100644
--- a/contrib/amcheck/verify_common.c
+++ b/contrib/amcheck/verify_common.c
@@ -50,14 +50,14 @@ amcheck_index_mainfork_expected(Relation rel)
 }
 
 /*
-* Amcheck main workhorse.
-* Given index relation OID, lock relation.
-* Next, take a number of standard actions:
-* 1) Make sure the index can be checked
-* 2) change the context of the user,
-* 3) keep track of GUCs modified via index functions
-* 4) execute callback function to verify integrity.
-*/
+ * Amcheck main workhorse.
+ * Given index relation OID, lock relation.
+ * Next, take a number of standard actions:
+ * 1) Make sure the index can be checked
+ * 2) change the context of the user,
+ * 3) keep track of GUCs modified via index functions
+ * 4) execute callback function to verify integrity.
+ */
 void
 amcheck_lock_relation_and_check(Oid indrelid,
 								Oid am_id,
diff --git a/contrib/btree_gist/btree_gist.c b/contrib/btree_gist/btree_gist.c
index 39fcbdad334..a2cc2d708e1 100644
--- a/contrib/btree_gist/btree_gist.c
+++ b/contrib/btree_gist/btree_gist.c
@@ -49,9 +49,9 @@ gbtreekey_out(PG_FUNCTION_ARGS)
 
 
 /*
-** GiST DeCompress methods
-** do not do anything.
-*/
+ * GiST DeCompress methods
+ * do not do anything.
+ */
 Datum
 gbt_decompress(PG_FUNCTION_ARGS)
 {
diff --git a/contrib/btree_gist/btree_utils_num.c b/contrib/btree_gist/btree_utils_num.c
index 51c8836f27a..3affe4c2c46 100644
--- a/contrib/btree_gist/btree_utils_num.c
+++ b/contrib/btree_gist/btree_utils_num.c
@@ -165,8 +165,8 @@ gbt_num_fetch(GISTENTRY *entry, const gbtree_ninfo *tinfo)
 
 
 /*
-** The GiST union method for numerical values
-*/
+ * The GiST union method for numerical values
+ */
 
 void *
 gbt_num_union(GBT_NUMKEY *out, const GistEntryVector *entryvec, const gbtree_ninfo *tinfo, FmgrInfo *flinfo)
@@ -205,8 +205,8 @@ gbt_num_union(GBT_NUMKEY *out, const GistEntryVector *entryvec, const gbtree_nin
 
 
 /*
-** The GiST same method for numerical values
-*/
+ * The GiST same method for numerical values
+ */
 
 bool
 gbt_num_same(const GBT_NUMKEY *a, const GBT_NUMKEY *b, const gbtree_ninfo *tinfo, FmgrInfo *flinfo)
@@ -309,8 +309,8 @@ gbt_num_consistent(const GBT_NUMKEY_R *key,
 
 
 /*
-** The GiST distance method (for KNN-Gist)
-*/
+ * The GiST distance method (for KNN-Gist)
+ */
 
 float8
 gbt_num_distance(const GBT_NUMKEY_R *key,
diff --git a/contrib/btree_gist/btree_utils_var.c b/contrib/btree_gist/btree_utils_var.c
index e1945cf808f..25c3bbe8eac 100644
--- a/contrib/btree_gist/btree_utils_var.c
+++ b/contrib/btree_gist/btree_utils_var.c
@@ -118,7 +118,7 @@ gbt_var_leaf2node(GBT_VARKEY *leaf, const gbtree_vinfo *tinfo, FmgrInfo *flinfo)
  *
  * If the underlying type is character data, the prefix length may point in
  * the middle of a multibyte character.
-*/
+ */
 static int32
 gbt_var_node_cp_len(const GBT_VARKEY *node, const gbtree_vinfo *tinfo)
 {
@@ -207,9 +207,9 @@ gbt_var_node_pf_match(const GBT_VARKEY_R *node, const bytea *query, const gbtree
 
 
 /*
-*  truncates / compresses the node key
-*  cpf_length .. common prefix length
-*/
+ *  truncates / compresses the node key
+ *  cpf_length .. common prefix length
+ */
 static GBT_VARKEY *
 gbt_var_node_truncate(const GBT_VARKEY *node, int32 cpf_length, const gbtree_vinfo *tinfo)
 {
diff --git a/contrib/cube/cube.c b/contrib/cube/cube.c
index 77263ab277f..28d48549b36 100644
--- a/contrib/cube/cube.c
+++ b/contrib/cube/cube.c
@@ -29,8 +29,8 @@ PG_MODULE_MAGIC_EXT(
 #define ARRNELEMS(x)  ArrayGetNItems( ARR_NDIM(x), ARR_DIMS(x))
 
 /*
-** Input/Output routines
-*/
+ * Input/Output routines
+ */
 PG_FUNCTION_INFO_V1(cube_in);
 PG_FUNCTION_INFO_V1(cube_a_f8_f8);
 PG_FUNCTION_INFO_V1(cube_a_f8);
@@ -49,8 +49,8 @@ PG_FUNCTION_INFO_V1(cube_coord_llur);
 PG_FUNCTION_INFO_V1(cube_subset);
 
 /*
-** GiST support methods
-*/
+ * GiST support methods
+ */
 
 PG_FUNCTION_INFO_V1(g_cube_consistent);
 PG_FUNCTION_INFO_V1(g_cube_compress);
@@ -62,8 +62,8 @@ PG_FUNCTION_INFO_V1(g_cube_same);
 PG_FUNCTION_INFO_V1(g_cube_distance);
 
 /*
-** B-tree support functions
-*/
+ * B-tree support functions
+ */
 PG_FUNCTION_INFO_V1(cube_eq);
 PG_FUNCTION_INFO_V1(cube_ne);
 PG_FUNCTION_INFO_V1(cube_lt);
@@ -73,8 +73,8 @@ PG_FUNCTION_INFO_V1(cube_ge);
 PG_FUNCTION_INFO_V1(cube_cmp);
 
 /*
-** R-tree support functions
-*/
+ * R-tree support functions
+ */
 
 PG_FUNCTION_INFO_V1(cube_contains);
 PG_FUNCTION_INFO_V1(cube_contained);
@@ -84,8 +84,8 @@ PG_FUNCTION_INFO_V1(cube_inter);
 PG_FUNCTION_INFO_V1(cube_size);
 
 /*
-** miscellaneous
-*/
+ * miscellaneous
+ */
 PG_FUNCTION_INFO_V1(distance_taxicab);
 PG_FUNCTION_INFO_V1(cube_distance);
 PG_FUNCTION_INFO_V1(distance_chebyshev);
@@ -93,8 +93,8 @@ PG_FUNCTION_INFO_V1(cube_is_point);
 PG_FUNCTION_INFO_V1(cube_enlarge);
 
 /*
-** For internal use only
-*/
+ * For internal use only
+ */
 int32		cube_cmp_v0(NDBOX *a, NDBOX *b);
 bool		cube_contains_v0(NDBOX *a, NDBOX *b);
 bool		cube_overlap_v0(NDBOX *a, NDBOX *b);
@@ -105,8 +105,8 @@ bool		g_cube_leaf_consistent(NDBOX *key, NDBOX *query, StrategyNumber strategy);
 bool		g_cube_internal_consistent(NDBOX *key, NDBOX *query, StrategyNumber strategy);
 
 /*
-** Auxiliary functions
-*/
+ * Auxiliary functions
+ */
 static double distance_1D(double a1, double a2, double b1, double b2);
 static bool cube_is_point_internal(NDBOX *cube);
 
@@ -137,8 +137,8 @@ cube_in(PG_FUNCTION_ARGS)
 
 
 /*
-** Allows the construction of a cube from 2 float[]'s
-*/
+ * Allows the construction of a cube from 2 float[]'s
+ */
 Datum
 cube_a_f8_f8(PG_FUNCTION_ARGS)
 {
@@ -204,8 +204,8 @@ cube_a_f8_f8(PG_FUNCTION_ARGS)
 }
 
 /*
-** Allows the construction of a zero-volume cube from a float[]
-*/
+ * Allows the construction of a zero-volume cube from a float[]
+ */
 Datum
 cube_a_f8(PG_FUNCTION_ARGS)
 {
@@ -386,11 +386,11 @@ cube_recv(PG_FUNCTION_ARGS)
  *****************************************************************************/
 
 /*
-** The GiST Consistent method for boxes
-** Should return false if for all data items x below entry,
-** the predicate x op query == false, where op is the oper
-** corresponding to strategy in the pg_amop table.
-*/
+ * The GiST Consistent method for boxes
+ * Should return false if for all data items x below entry,
+ * the predicate x op query == false, where op is the oper
+ * corresponding to strategy in the pg_amop table.
+ */
 Datum
 g_cube_consistent(PG_FUNCTION_ARGS)
 {
@@ -423,9 +423,9 @@ g_cube_consistent(PG_FUNCTION_ARGS)
 
 
 /*
-** The GiST Union method for boxes
-** returns the minimal bounding box that encloses all the entries in entryvec
-*/
+ * The GiST Union method for boxes
+ * returns the minimal bounding box that encloses all the entries in entryvec
+ */
 Datum
 g_cube_union(PG_FUNCTION_ARGS)
 {
@@ -454,9 +454,9 @@ g_cube_union(PG_FUNCTION_ARGS)
 }
 
 /*
-** GiST Compress and Decompress methods for boxes
-** do not do anything.
-*/
+ * GiST Compress and Decompress methods for boxes
+ * do not do anything.
+ */
 
 Datum
 g_cube_compress(PG_FUNCTION_ARGS)
@@ -484,9 +484,9 @@ g_cube_decompress(PG_FUNCTION_ARGS)
 
 
 /*
-** The GiST Penalty method for boxes
-** As in the R-tree paper, we use change in area as our penalty metric
-*/
+ * The GiST Penalty method for boxes
+ * As in the R-tree paper, we use change in area as our penalty metric
+ */
 Datum
 g_cube_penalty(PG_FUNCTION_ARGS)
 {
@@ -509,9 +509,9 @@ g_cube_penalty(PG_FUNCTION_ARGS)
 
 
 /*
-** The GiST PickSplit method for boxes
-** We use Guttman's poly time split algorithm
-*/
+ * The GiST PickSplit method for boxes
+ * We use Guttman's poly time split algorithm
+ */
 Datum
 g_cube_picksplit(PG_FUNCTION_ARGS)
 {
@@ -660,8 +660,8 @@ g_cube_picksplit(PG_FUNCTION_ARGS)
 }
 
 /*
-** Equality method
-*/
+ * Equality method
+ */
 Datum
 g_cube_same(PG_FUNCTION_ARGS)
 {
@@ -678,8 +678,8 @@ g_cube_same(PG_FUNCTION_ARGS)
 }
 
 /*
-** SUPPORT ROUTINES
-*/
+ * SUPPORT ROUTINES
+ */
 bool
 g_cube_leaf_consistent(NDBOX *key,
 					   NDBOX *query,
@@ -936,8 +936,10 @@ rt_cube_size(NDBOX *a, double *size)
 	*size = result;
 }
 
-/* make up a metric in which one box will be 'lower' than the other
-   -- this can be useful for sorting and to determine uniqueness */
+/*
+ * make up a metric in which one box will be 'lower' than the other
+ * -- this can be useful for sorting and to determine uniqueness
+ */
 int32
 cube_cmp_v0(NDBOX *a, NDBOX *b)
 {
@@ -1250,10 +1252,12 @@ cube_overlap(PG_FUNCTION_ARGS)
 
 
 /* Distance */
-/* The distance is computed as a per axis sum of the squared distances
-   between 1D projections of the boxes onto Cartesian axes. Assuming zero
-   distance between overlapping projections, this metric coincides with the
-   "common sense" geometric distance */
+/*
+ * The distance is computed as a per axis sum of the squared distances
+ * between 1D projections of the boxes onto Cartesian axes. Assuming zero
+ * distance between overlapping projections, this metric coincides with the
+ * "common sense" geometric distance
+ */
 Datum
 cube_distance(PG_FUNCTION_ARGS)
 {
@@ -1817,8 +1821,10 @@ cube_f8_f8(PG_FUNCTION_ARGS)
 	PG_RETURN_NDBOX_P(result);
 }
 
-/* Add a dimension to an existing cube with the same values for the new
-   coordinate */
+/*
+ * Add a dimension to an existing cube with the same values for the new
+ * coordinate
+ */
 Datum
 cube_c_f8(PG_FUNCTION_ARGS)
 {
diff --git a/contrib/fuzzystrmatch/daitch_mokotoff.c b/contrib/fuzzystrmatch/daitch_mokotoff.c
index 72e556d552d..5dfa408f8e3 100644
--- a/contrib/fuzzystrmatch/daitch_mokotoff.c
+++ b/contrib/fuzzystrmatch/daitch_mokotoff.c
@@ -38,7 +38,7 @@
  *   744300 instead of 743000 as for "BEST".
  * - "J" is considered (only) a consonant in DaitchMokotoffSoundex.java
  * - "Y" is not considered a vowel in DaitchMokotoffSoundex.java
-*/
+ */
 
 #include "postgres.h"
 
@@ -53,7 +53,7 @@
  * The soundex coding chart table is adapted from
  * https://www.jewishgen.org/InfoFiles/Soundex.html
  * See daitch_mokotoff_header.pl for details.
-*/
+ */
 
 /* Generated coding chart table */
 #include "daitch_mokotoff.h"
diff --git a/contrib/fuzzystrmatch/dmetaphone.c b/contrib/fuzzystrmatch/dmetaphone.c
index 062667527c2..2acc62c7d99 100644
--- a/contrib/fuzzystrmatch/dmetaphone.c
+++ b/contrib/fuzzystrmatch/dmetaphone.c
@@ -347,8 +347,8 @@ SetAt(metastring *s, int pos, char c)
 
 
 /*
-   Caveats: the START value is 0 based
-*/
+ * Caveats: the START value is 0 based
+ */
 static int
 StringAt(metastring *s, int start, int length,...)
 {
diff --git a/contrib/fuzzystrmatch/fuzzystrmatch.c b/contrib/fuzzystrmatch/fuzzystrmatch.c
index 90a1969b114..e527b1048b5 100644
--- a/contrib/fuzzystrmatch/fuzzystrmatch.c
+++ b/contrib/fuzzystrmatch/fuzzystrmatch.c
@@ -97,9 +97,11 @@ soundex_code(char letter)
 ****************************************************************************/
 
 
-/*	I add modifications to the traditional metaphone algorithm that you
-	might find in books.  Define this if you want metaphone to behave
-	traditionally */
+/*
+ * I add modifications to the traditional metaphone algorithm that you
+ * might find in books.  Define this if you want metaphone to behave
+ * traditionally
+ */
 #undef USE_TRADITIONAL_METAPHONE
 
 /* Special encodings */
@@ -302,8 +304,10 @@ metaphone(PG_FUNCTION_ARGS)
  * function (palloc, etc).
  */
 
-/* I suppose I could have been using a character pointer instead of
- * accessing the array directly... */
+/*
+ * I suppose I could have been using a character pointer instead of
+ * accessing the array directly...
+ */
 
 /* Look at the next letter in the word */
 #define Next_Letter (pg_ascii_toupper((unsigned char) word[w_idx+1]))
diff --git a/contrib/intarray/_int_gist.c b/contrib/intarray/_int_gist.c
index 586e19df01b..98711ac54e2 100644
--- a/contrib/intarray/_int_gist.c
+++ b/contrib/intarray/_int_gist.c
@@ -25,8 +25,8 @@
 /* or: #define MAXNUMELTS 1000000 */
 
 /*
-** GiST support methods
-*/
+ * GiST support methods
+ */
 PG_FUNCTION_INFO_V1(g_int_consistent);
 PG_FUNCTION_INFO_V1(g_int_compress);
 PG_FUNCTION_INFO_V1(g_int_decompress);
@@ -38,11 +38,11 @@ PG_FUNCTION_INFO_V1(g_int_options);
 
 
 /*
-** The GiST Consistent method for _intments
-** Should return false if for all data items x below entry,
-** the predicate x op query == false, where op is the oper
-** corresponding to strategy in the pg_amop table.
-*/
+ * The GiST Consistent method for _intments
+ * Should return false if for all data items x below entry,
+ * the predicate x op query == false, where op is the oper
+ * corresponding to strategy in the pg_amop table.
+ */
 Datum
 g_int_consistent(PG_FUNCTION_ARGS)
 {
@@ -158,8 +158,8 @@ g_int_union(PG_FUNCTION_ARGS)
 }
 
 /*
-** GiST Compress and Decompress methods
-*/
+ * GiST Compress and Decompress methods
+ */
 Datum
 g_int_compress(PG_FUNCTION_ARGS)
 {
@@ -359,8 +359,8 @@ g_int_decompress(PG_FUNCTION_ARGS)
 }
 
 /*
-** The GiST Penalty method for _intments
-*/
+ * The GiST Penalty method for _intments
+ */
 Datum
 g_int_penalty(PG_FUNCTION_ARGS)
 {
@@ -436,9 +436,9 @@ comparecost(const void *a, const void *b)
 }
 
 /*
-** The GiST PickSplit method for _intments
-** We use Guttman's poly time split algorithm
-*/
+ * The GiST PickSplit method for _intments
+ * We use Guttman's poly time split algorithm
+ */
 Datum
 g_int_picksplit(PG_FUNCTION_ARGS)
 {
diff --git a/contrib/intarray/_intbig_gist.c b/contrib/intarray/_intbig_gist.c
index 6ffb03dab58..396da703438 100644
--- a/contrib/intarray/_intbig_gist.c
+++ b/contrib/intarray/_intbig_gist.c
@@ -12,8 +12,8 @@
 
 #define GETENTRY(vec,pos) ((GISTTYPE *) DatumGetPointer((vec)->vector[(pos)].key))
 /*
-** _intbig methods
-*/
+ * _intbig methods
+ */
 PG_FUNCTION_INFO_V1(g_intbig_consistent);
 PG_FUNCTION_INFO_V1(g_intbig_compress);
 PG_FUNCTION_INFO_V1(g_intbig_decompress);
diff --git a/contrib/isn/isn.c b/contrib/isn/isn.c
index 5bf9d668fe0..a1d2f26158a 100644
--- a/contrib/isn/isn.c
+++ b/contrib/isn/isn.c
@@ -1042,8 +1042,9 @@ upc_in(PG_FUNCTION_ARGS)
 	PG_RETURN_EAN13(result);
 }
 
-/* casting functions
-*/
+/*
+ * casting functions
+ */
 PG_FUNCTION_INFO_V1(isbn_cast_from_ean13);
 Datum
 isbn_cast_from_ean13(PG_FUNCTION_ARGS)
diff --git a/contrib/pgcrypto/crypt-blowfish.c b/contrib/pgcrypto/crypt-blowfish.c
index 5a1b1e10091..563393c9284 100644
--- a/contrib/pgcrypto/crypt-blowfish.c
+++ b/contrib/pgcrypto/crypt-blowfish.c
@@ -741,15 +741,19 @@ _crypt_blowfish_rn(const char *key, const char *setting,
 	output[7 + 22 - 1] = BF_itoa64[(int)
 								   BF_atoi64[(int) setting[7 + 22 - 1] - 0x20] & 0x30];
 
-/* This has to be bug-compatible with the original implementation, so
- * only encode 23 of the 24 bytes. :-) */
+/*
+ * This has to be bug-compatible with the original implementation, so
+ * only encode 23 of the 24 bytes. :-)
+ */
 	BF_swap(data.binary.output, 6);
 	BF_encode(&output[7 + 22], data.binary.output, 23);
 	output[7 + 22 + 31] = '\0';
 
-/* Overwrite the most obvious sensitive data we have on the stack. Note
+/*
+ * Overwrite the most obvious sensitive data we have on the stack. Note
  * that this does not guarantee there's no sensitive data left on the
- * stack and/or in registers; I'm not aware of portable code that does. */
+ * stack and/or in registers; I'm not aware of portable code that does.
+ */
 	px_memset(&data, 0, sizeof(data));
 
 	return output;
diff --git a/contrib/pgcrypto/crypt-gensalt.c b/contrib/pgcrypto/crypt-gensalt.c
index 7149dce02d5..393c323fd57 100644
--- a/contrib/pgcrypto/crypt-gensalt.c
+++ b/contrib/pgcrypto/crypt-gensalt.c
@@ -45,8 +45,10 @@ _crypt_gensalt_extended_rn(unsigned long count,
 {
 	unsigned long value;
 
-/* Even iteration counts make it easier to detect weak DES keys from a look
- * at the hash, so they should be avoided */
+/*
+ * Even iteration counts make it easier to detect weak DES keys from a look
+ * at the hash, so they should be avoided
+ */
 	if (size < 3 || output_size < 1 + 4 + 4 + 1 ||
 		(count && (count > 0xffffff || !(count & 1))))
 	{
diff --git a/contrib/seg/seg.c b/contrib/seg/seg.c
index eff8449399a..537c3ebbdd0 100644
--- a/contrib/seg/seg.c
+++ b/contrib/seg/seg.c
@@ -1,11 +1,11 @@
 /*
  * contrib/seg/seg.c
  *
- ******************************************************************************
+ *
  *  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
  *  format for these routines is dictated by Postgres architecture.
-******************************************************************************/
+ */
 
 #include "postgres.h"
 
@@ -24,9 +24,9 @@
 
 
 /*
-#define GIST_DEBUG
-#define GIST_QUERY_DEBUG
-*/
+ * #define GIST_DEBUG
+ * #define GIST_QUERY_DEBUG
+ */
 
 PG_MODULE_MAGIC_EXT(
 					.name = "seg",
@@ -44,8 +44,8 @@ typedef struct
 } gseg_picksplit_item;
 
 /*
-** Input/Output routines
-*/
+ * Input/Output routines
+ */
 PG_FUNCTION_INFO_V1(seg_in);
 PG_FUNCTION_INFO_V1(seg_out);
 PG_FUNCTION_INFO_V1(seg_size);
@@ -54,8 +54,8 @@ PG_FUNCTION_INFO_V1(seg_upper);
 PG_FUNCTION_INFO_V1(seg_center);
 
 /*
-** GiST support methods
-*/
+ * GiST support methods
+ */
 PG_FUNCTION_INFO_V1(gseg_consistent);
 PG_FUNCTION_INFO_V1(gseg_compress);
 PG_FUNCTION_INFO_V1(gseg_decompress);
@@ -69,8 +69,8 @@ static Datum gseg_binary_union(Datum r1, Datum r2, int *sizep);
 
 
 /*
-** R-tree support functions
-*/
+ * R-tree support functions
+ */
 PG_FUNCTION_INFO_V1(seg_same);
 PG_FUNCTION_INFO_V1(seg_contains);
 PG_FUNCTION_INFO_V1(seg_contained);
@@ -84,8 +84,8 @@ PG_FUNCTION_INFO_V1(seg_inter);
 static void rt_seg_size(SEG *a, float *size);
 
 /*
-** Various operators
-*/
+ * Various operators
+ */
 PG_FUNCTION_INFO_V1(seg_cmp);
 PG_FUNCTION_INFO_V1(seg_lt);
 PG_FUNCTION_INFO_V1(seg_le);
@@ -94,8 +94,8 @@ PG_FUNCTION_INFO_V1(seg_ge);
 PG_FUNCTION_INFO_V1(seg_different);
 
 /*
-** Auxiliary functions
-*/
+ * Auxiliary functions
+ */
 static int	restore(char *result, float val, int n);
 
 
@@ -191,11 +191,11 @@ seg_upper(PG_FUNCTION_ARGS)
  *****************************************************************************/
 
 /*
-** The GiST Consistent method for segments
-** Should return false if for all data items x below entry,
-** the predicate x op query == false, where op is the oper
-** corresponding to strategy in the pg_amop table.
-*/
+ * The GiST Consistent method for segments
+ * Should return false if for all data items x below entry,
+ * the predicate x op query == false, where op is the oper
+ * corresponding to strategy in the pg_amop table.
+ */
 Datum
 gseg_consistent(PG_FUNCTION_ARGS)
 {
@@ -221,9 +221,9 @@ gseg_consistent(PG_FUNCTION_ARGS)
 }
 
 /*
-** The GiST Union method for segments
-** returns the minimal bounding seg that encloses all the entries in entryvec
-*/
+ * The GiST Union method for segments
+ * returns the minimal bounding seg that encloses all the entries in entryvec
+ */
 Datum
 gseg_union(PG_FUNCTION_ARGS)
 {
@@ -252,9 +252,9 @@ gseg_union(PG_FUNCTION_ARGS)
 }
 
 /*
-** GiST Compress and Decompress methods for segments
-** do not do anything.
-*/
+ * GiST Compress and Decompress methods for segments
+ * do not do anything.
+ */
 Datum
 gseg_compress(PG_FUNCTION_ARGS)
 {
@@ -268,9 +268,9 @@ gseg_decompress(PG_FUNCTION_ARGS)
 }
 
 /*
-** The GiST Penalty method for segments
-** As in the R-tree paper, we use change in area as our penalty metric
-*/
+ * The GiST Penalty method for segments
+ * As in the R-tree paper, we use change in area as our penalty metric
+ */
 Datum
 gseg_penalty(PG_FUNCTION_ARGS)
 {
@@ -411,8 +411,8 @@ gseg_picksplit(PG_FUNCTION_ARGS)
 }
 
 /*
-** Equality methods
-*/
+ * Equality methods
+ */
 Datum
 gseg_same(PG_FUNCTION_ARGS)
 {
@@ -431,8 +431,8 @@ gseg_same(PG_FUNCTION_ARGS)
 }
 
 /*
-** SUPPORT ROUTINES
-*/
+ * SUPPORT ROUTINES
+ */
 static Datum
 gseg_leaf_consistent(Datum key, Datum query, StrategyNumber strategy)
 {
@@ -1064,8 +1064,8 @@ restore(char *result, float val, int n)
 
 
 /*
-** Miscellany
-*/
+ * Miscellany
+ */
 
 /*
  * find out the number of significant digits in a string representing
diff --git a/contrib/spi/moddatetime.c b/contrib/spi/moddatetime.c
index 5013eee433e..3e64964b969 100644
--- a/contrib/spi/moddatetime.c
+++ b/contrib/spi/moddatetime.c
@@ -1,18 +1,18 @@
 /*
-moddatetime.c
-
-contrib/spi/moddatetime.c
-
-What is this?
-It is a function to be called from a trigger for the purpose of updating
-a modification datetime stamp in a record when that record is UPDATEd.
-
-Credits
-This is 95%+ based on autoinc.c, which I used as a starting point as I do
-not really know what I am doing.  I also had help from
-Jan Wieck <jwieck@debis.com> who told me about the timestamp_in("now") function.
-OH, me, I'm Terry Mackintosh <terry@terrym.com>
-*/
+ * moddatetime.c
+ *
+ * contrib/spi/moddatetime.c
+ *
+ * What is this?
+ * It is a function to be called from a trigger for the purpose of updating
+ * a modification datetime stamp in a record when that record is UPDATEd.
+ *
+ * Credits
+ * This is 95%+ based on autoinc.c, which I used as a starting point as I do
+ * not really know what I am doing.  I also had help from
+ * Jan Wieck <jwieck@debis.com> who told me about the timestamp_in("now") function.
+ * OH, me, I'm Terry Mackintosh <terry@terrym.com>
+ */
 #include "postgres.h"
 
 #include "access/htup_details.h"
diff --git a/src/backend/access/gin/gininsert.c b/src/backend/access/gin/gininsert.c
index 9d83a495775..cb9ed3b563c 100644
--- a/src/backend/access/gin/gininsert.c
+++ b/src/backend/access/gin/gininsert.c
@@ -2405,7 +2405,7 @@ _gin_parse_tuple_key(GinTuple *a)
 }
 
 /*
-* _gin_parse_tuple_items
+ * _gin_parse_tuple_items
  *		Return a pointer to a palloc'd array of decompressed TID array.
  */
 static ItemPointer
diff --git a/src/backend/access/nbtree/nbtreadpage.c b/src/backend/access/nbtree/nbtreadpage.c
index 2ba1ca66023..448a5141244 100644
--- a/src/backend/access/nbtree/nbtreadpage.c
+++ b/src/backend/access/nbtree/nbtreadpage.c
@@ -3339,7 +3339,7 @@ _bt_skiparray_set_isnull(Relation rel, ScanKey skey, BTArrayKeyInfo *array)
  * compare the value that they're searching for to a binary search pivot.
  * However, unlike _bt_compare, this function's "tuple argument" comes first,
  * while its "array/scankey argument" comes second.
-*/
+ */
 static inline int32
 _bt_compare_array_skey(FmgrInfo *orderproc,
 					   Datum tupdatum, bool tupnull,
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index f0434da40c9..d34e34a56c5 100644
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -1200,7 +1200,7 @@ ReserveXLogInsertLocation(int size, XLogRecPtr *StartPos, XLogRecPtr *EndPos,
  * *EndPos value. However, if we are already at the beginning of the current
  * segment, *StartPos and *EndPos are set to the current location without
  * reserving any space, and the function returns false.
-*/
+ */
 static bool
 ReserveXLogSwitch(XLogRecPtr *StartPos, XLogRecPtr *EndPos, XLogRecPtr *PrevPtr)
 {
diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c
index 7678ab13f6a..4f6b00bd739 100644
--- a/src/backend/catalog/heap.c
+++ b/src/backend/catalog/heap.c
@@ -263,7 +263,8 @@ SystemAttributeByName(const char *attname)
 
 /* ----------------------------------------------------------------
  *				XXX END OF UGLY HARD CODED BADNESS XXX
- * ---------------------------------------------------------------- */
+ * ----------------------------------------------------------------
+ */
 
 
 /* ----------------------------------------------------------------
diff --git a/src/backend/commands/copyto.c b/src/backend/commands/copyto.c
index 85d15353647..1085d0d5b8d 100644
--- a/src/backend/commands/copyto.c
+++ b/src/backend/commands/copyto.c
@@ -1327,7 +1327,7 @@ DoCopyTo(CopyToState cstate)
  * root_rel can be set to the root table of rel if rel is a partition
  * table so that we can send tuples in root_rel's rowtype, which might
  * differ from individual partitions.
-*/
+ */
 static void
 CopyRelationTo(CopyToState cstate, Relation rel, Relation root_rel, uint64 *processed)
 {
diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
index 88451c91448..92b0f38c353 100644
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@ -13903,7 +13903,7 @@ transformFkeyCheckAttrs(Relation pkrel,
  *
  *	Wrapper around find_coercion_pathway() for ATAddForeignKeyConstraint().
  *	Caller has equal regard for binary coercibility and for an exact match.
-*/
+ */
 static CoercionPathType
 findFkeyCast(Oid targetTypeId, Oid sourceTypeId, Oid *funcid)
 {
diff --git a/src/backend/executor/nodeWindowAgg.c b/src/backend/executor/nodeWindowAgg.c
index 1fd4503850f..5cc39bd9086 100644
--- a/src/backend/executor/nodeWindowAgg.c
+++ b/src/backend/executor/nodeWindowAgg.c
@@ -3528,7 +3528,7 @@ init_notnull_info(WindowObject winobj, WindowStatePerFunc perfuncstate)
  * expand notnull_info if necessary.
  * pos: not null info position
  * argno: argument number
-*/
+ */
 static void
 grow_notnull_info(WindowObject winobj, int64 pos, int argno)
 {
diff --git a/src/backend/libpq/pqformat.c b/src/backend/libpq/pqformat.c
index ebb09db157a..8b41aa4f1cb 100644
--- a/src/backend/libpq/pqformat.c
+++ b/src/backend/libpq/pqformat.c
@@ -98,7 +98,7 @@ pq_beginmessage(StringInfo buf, char msgtype)
 }
 
 /* --------------------------------
-
+ *
  *		pq_beginmessage_reuse - initialize for sending a message, reuse buffer
  *
  * This requires the buffer to be allocated in a sufficiently long-lived
diff --git a/src/backend/optimizer/geqo/geqo_copy.c b/src/backend/optimizer/geqo/geqo_copy.c
index 7a075d39b1f..b22f66fd342 100644
--- a/src/backend/optimizer/geqo/geqo_copy.c
+++ b/src/backend/optimizer/geqo/geqo_copy.c
@@ -10,12 +10,13 @@
  *-------------------------------------------------------------------------
  */
 
-/* contributed by:
-   =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
-   *  Martin Utesch				 * Institute of Automatic Control	   *
-   =							 = University of Mining and Technology =
-   *  utesch@aut.tu-freiberg.de  * Freiberg, Germany				   *
-   =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
+/*
+ * contributed by:
+ * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
+ *  Martin Utesch				 * Institute of Automatic Control	   *
+ * =							 = University of Mining and Technology =
+ *  utesch@aut.tu-freiberg.de  * Freiberg, Germany				   *
+ * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
  */
 
 /* this is adopted from D. Whitley's Genitor algorithm */
diff --git a/src/backend/optimizer/geqo/geqo_cx.c b/src/backend/optimizer/geqo/geqo_cx.c
index 0c77b1537df..7de86663e02 100644
--- a/src/backend/optimizer/geqo/geqo_cx.c
+++ b/src/backend/optimizer/geqo/geqo_cx.c
@@ -11,12 +11,13 @@
 *-------------------------------------------------------------------------
 */
 
-/* contributed by:
-   =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
-   *  Martin Utesch				 * Institute of Automatic Control	   *
-   =							 = University of Mining and Technology =
-   *  utesch@aut.tu-freiberg.de  * Freiberg, Germany				   *
-   =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
+/*
+ * contributed by:
+ * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
+ *  Martin Utesch				 * Institute of Automatic Control	   *
+ * =							 = University of Mining and Technology =
+ *  utesch@aut.tu-freiberg.de  * Freiberg, Germany				   *
+ * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
  */
 
 /* the cx algorithm is adopted from Genitor : */
diff --git a/src/backend/optimizer/geqo/geqo_erx.c b/src/backend/optimizer/geqo/geqo_erx.c
index cd1da609575..af19aceb74a 100644
--- a/src/backend/optimizer/geqo/geqo_erx.c
+++ b/src/backend/optimizer/geqo/geqo_erx.c
@@ -8,12 +8,13 @@
 *-------------------------------------------------------------------------
 */
 
-/* contributed by:
-   =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
-   *  Martin Utesch				 * Institute of Automatic Control	   *
-   =							 = University of Mining and Technology =
-   *  utesch@aut.tu-freiberg.de  * Freiberg, Germany				   *
-   =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
+/*
+ * contributed by:
+ * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
+ *  Martin Utesch				 * Institute of Automatic Control	   *
+ * =							 = University of Mining and Technology =
+ *  utesch@aut.tu-freiberg.de  * Freiberg, Germany				   *
+ * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
  */
 
 /* the edge recombination algorithm is adopted from Genitor : */
diff --git a/src/backend/optimizer/geqo/geqo_eval.c b/src/backend/optimizer/geqo/geqo_eval.c
index 56ad3df98fa..b6dd25d9b57 100644
--- a/src/backend/optimizer/geqo/geqo_eval.c
+++ b/src/backend/optimizer/geqo/geqo_eval.c
@@ -11,12 +11,13 @@
  *-------------------------------------------------------------------------
  */
 
-/* contributed by:
-   =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
-   *  Martin Utesch				 * Institute of Automatic Control	   *
-   =							 = University of Mining and Technology =
-   *  utesch@aut.tu-freiberg.de  * Freiberg, Germany				   *
-   =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
+/*
+ * contributed by:
+ * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
+ *  Martin Utesch				 * Institute of Automatic Control	   *
+ * =							 = University of Mining and Technology =
+ *  utesch@aut.tu-freiberg.de  * Freiberg, Germany				   *
+ * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
  */
 
 #include "postgres.h"
diff --git a/src/backend/optimizer/geqo/geqo_main.c b/src/backend/optimizer/geqo/geqo_main.c
index f2dd9d84381..cab97ddafb9 100644
--- a/src/backend/optimizer/geqo/geqo_main.c
+++ b/src/backend/optimizer/geqo/geqo_main.c
@@ -12,12 +12,13 @@
  *-------------------------------------------------------------------------
  */
 
-/* contributed by:
-   =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
-   *  Martin Utesch				 * Institute of Automatic Control	   *
-   =							 = University of Mining and Technology =
-   *  utesch@aut.tu-freiberg.de  * Freiberg, Germany				   *
-   =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
+/*
+ * contributed by:
+ * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
+ *  Martin Utesch				 * Institute of Automatic Control	   *
+ * =							 = University of Mining and Technology =
+ *  utesch@aut.tu-freiberg.de  * Freiberg, Germany				   *
+ * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
  */
 
 /* -- parts of this are adapted from D. Whitley's Genitor algorithm -- */
diff --git a/src/backend/optimizer/geqo/geqo_misc.c b/src/backend/optimizer/geqo/geqo_misc.c
index b856deb4cc5..bacbf713f2b 100644
--- a/src/backend/optimizer/geqo/geqo_misc.c
+++ b/src/backend/optimizer/geqo/geqo_misc.c
@@ -11,12 +11,13 @@
  *-------------------------------------------------------------------------
  */
 
-/* contributed by:
-   =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
-   *  Martin Utesch				 * Institute of Automatic Control	   *
-   =							 = University of Mining and Technology =
-   *  utesch@aut.tu-freiberg.de  * Freiberg, Germany				   *
-   =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
+/*
+ * contributed by:
+ * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
+ *  Martin Utesch				 * Institute of Automatic Control	   *
+ * =							 = University of Mining and Technology =
+ *  utesch@aut.tu-freiberg.de  * Freiberg, Germany				   *
+ * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
  */
 
 #include "postgres.h"
diff --git a/src/backend/optimizer/geqo/geqo_mutation.c b/src/backend/optimizer/geqo/geqo_mutation.c
index 56e8445e4ea..7e43fa8c536 100644
--- a/src/backend/optimizer/geqo/geqo_mutation.c
+++ b/src/backend/optimizer/geqo/geqo_mutation.c
@@ -9,12 +9,13 @@
 *-------------------------------------------------------------------------
 */
 
-/* contributed by:
-   =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
-   *  Martin Utesch				 * Institute of Automatic Control	   *
-   =							 = University of Mining and Technology =
-   *  utesch@aut.tu-freiberg.de  * Freiberg, Germany				   *
-   =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
+/*
+ * contributed by:
+ * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
+ *  Martin Utesch				 * Institute of Automatic Control	   *
+ * =							 = University of Mining and Technology =
+ *  utesch@aut.tu-freiberg.de  * Freiberg, Germany				   *
+ * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
  */
 
 /* this is adopted from Genitor : */
diff --git a/src/backend/optimizer/geqo/geqo_ox1.c b/src/backend/optimizer/geqo/geqo_ox1.c
index 2bb5dfceeca..e4188215fd0 100644
--- a/src/backend/optimizer/geqo/geqo_ox1.c
+++ b/src/backend/optimizer/geqo/geqo_ox1.c
@@ -11,12 +11,13 @@
 *-------------------------------------------------------------------------
 */
 
-/* contributed by:
-   =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
-   *  Martin Utesch				 * Institute of Automatic Control	   *
-   =							 = University of Mining and Technology =
-   *  utesch@aut.tu-freiberg.de  * Freiberg, Germany				   *
-   =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
+/*
+ * contributed by:
+ * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
+ *  Martin Utesch				 * Institute of Automatic Control	   *
+ * =							 = University of Mining and Technology =
+ *  utesch@aut.tu-freiberg.de  * Freiberg, Germany				   *
+ * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
  */
 
 /* the ox algorithm is adopted from Genitor : */
diff --git a/src/backend/optimizer/geqo/geqo_ox2.c b/src/backend/optimizer/geqo/geqo_ox2.c
index d411d9022a6..2d23acd12fa 100644
--- a/src/backend/optimizer/geqo/geqo_ox2.c
+++ b/src/backend/optimizer/geqo/geqo_ox2.c
@@ -11,12 +11,13 @@
 *-------------------------------------------------------------------------
 */
 
-/* contributed by:
-   =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
-   *  Martin Utesch				 * Institute of Automatic Control	   *
-   =							 = University of Mining and Technology =
-   *  utesch@aut.tu-freiberg.de  * Freiberg, Germany				   *
-   =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
+/*
+ * contributed by:
+ * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
+ *  Martin Utesch				 * Institute of Automatic Control	   *
+ * =							 = University of Mining and Technology =
+ *  utesch@aut.tu-freiberg.de  * Freiberg, Germany				   *
+ * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
  */
 
 /* the ox algorithm is adopted from Genitor : */
diff --git a/src/backend/optimizer/geqo/geqo_pmx.c b/src/backend/optimizer/geqo/geqo_pmx.c
index 86826a3b8bc..f90802af52d 100644
--- a/src/backend/optimizer/geqo/geqo_pmx.c
+++ b/src/backend/optimizer/geqo/geqo_pmx.c
@@ -11,12 +11,13 @@
 *-------------------------------------------------------------------------
 */
 
-/* contributed by:
-   =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
-   *  Martin Utesch				 * Institute of Automatic Control	   *
-   =							 = University of Mining and Technology =
-   *  utesch@aut.tu-freiberg.de  * Freiberg, Germany				   *
-   =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
+/*
+ * contributed by:
+ * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
+ *  Martin Utesch				 * Institute of Automatic Control	   *
+ * =							 = University of Mining and Technology =
+ *  utesch@aut.tu-freiberg.de  * Freiberg, Germany				   *
+ * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
  */
 
 /* the pmx algorithm is adopted from Genitor : */
diff --git a/src/backend/optimizer/geqo/geqo_pool.c b/src/backend/optimizer/geqo/geqo_pool.c
index dcec5322b66..8f0b3d7f345 100644
--- a/src/backend/optimizer/geqo/geqo_pool.c
+++ b/src/backend/optimizer/geqo/geqo_pool.c
@@ -11,12 +11,13 @@
  *-------------------------------------------------------------------------
  */
 
-/* contributed by:
-   =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
-   *  Martin Utesch				 * Institute of Automatic Control	   *
-   =							 = University of Mining and Technology =
-   *  utesch@aut.tu-freiberg.de  * Freiberg, Germany				   *
-   =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
+/*
+ * contributed by:
+ * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
+ *  Martin Utesch				 * Institute of Automatic Control	   *
+ * =							 = University of Mining and Technology =
+ *  utesch@aut.tu-freiberg.de  * Freiberg, Germany				   *
+ * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
  */
 
 /* -- parts of this are adapted from D. Whitley's Genitor algorithm -- */
diff --git a/src/backend/optimizer/geqo/geqo_px.c b/src/backend/optimizer/geqo/geqo_px.c
index c81bbd1d648..825c3780124 100644
--- a/src/backend/optimizer/geqo/geqo_px.c
+++ b/src/backend/optimizer/geqo/geqo_px.c
@@ -11,12 +11,13 @@
 *-------------------------------------------------------------------------
 */
 
-/* contributed by:
-   =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
-   *  Martin Utesch				 * Institute of Automatic Control	   *
-   =							 = University of Mining and Technology =
-   *  utesch@aut.tu-freiberg.de  * Freiberg, Germany				   *
-   =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
+/*
+ * contributed by:
+ * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
+ *  Martin Utesch				 * Institute of Automatic Control	   *
+ * =							 = University of Mining and Technology =
+ *  utesch@aut.tu-freiberg.de  * Freiberg, Germany				   *
+ * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
  */
 
 /* the px algorithm is adopted from Genitor : */
diff --git a/src/backend/optimizer/geqo/geqo_recombination.c b/src/backend/optimizer/geqo/geqo_recombination.c
index 528b0dc5fed..1278d868420 100644
--- a/src/backend/optimizer/geqo/geqo_recombination.c
+++ b/src/backend/optimizer/geqo/geqo_recombination.c
@@ -8,12 +8,13 @@
 *-------------------------------------------------------------------------
 */
 
-/* contributed by:
-   =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
-   *  Martin Utesch				 * Institute of Automatic Control	   *
-   =							 = University of Mining and Technology =
-   *  utesch@aut.tu-freiberg.de  * Freiberg, Germany				   *
-   =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
+/*
+ * contributed by:
+ * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
+ *  Martin Utesch				 * Institute of Automatic Control	   *
+ * =							 = University of Mining and Technology =
+ *  utesch@aut.tu-freiberg.de  * Freiberg, Germany				   *
+ * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
  */
 
 /* -- parts of this are adapted from D. Whitley's Genitor algorithm -- */
diff --git a/src/backend/optimizer/geqo/geqo_selection.c b/src/backend/optimizer/geqo/geqo_selection.c
index a37316e8fd5..aa6c53e70ec 100644
--- a/src/backend/optimizer/geqo/geqo_selection.c
+++ b/src/backend/optimizer/geqo/geqo_selection.c
@@ -11,12 +11,13 @@
  *-------------------------------------------------------------------------
  */
 
-/* contributed by:
-   =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
-   *  Martin Utesch				 * Institute of Automatic Control	   *
-   =							 = University of Mining and Technology =
-   *  utesch@aut.tu-freiberg.de  * Freiberg, Germany				   *
-   =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
+/*
+ * contributed by:
+ * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
+ *  Martin Utesch				 * Institute of Automatic Control	   *
+ * =							 = University of Mining and Technology =
+ *  utesch@aut.tu-freiberg.de  * Freiberg, Germany				   *
+ * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
  */
 
 /* this is adopted from D. Whitley's Genitor algorithm */
diff --git a/src/backend/port/win32/signal.c b/src/backend/port/win32/signal.c
index f0025428037..1ef0ca999e1 100644
--- a/src/backend/port/win32/signal.c
+++ b/src/backend/port/win32/signal.c
@@ -375,8 +375,10 @@ pg_signal_thread(LPVOID param)
 }
 
 
-/* Console control handler will execute on a thread created
-   by the OS at the time of invocation */
+/*
+ * Console control handler will execute on a thread created
+ * by the OS at the time of invocation
+ */
 static BOOL WINAPI
 pg_console_handler(DWORD dwCtrlType)
 {
diff --git a/src/backend/replication/logical/applyparallelworker.c b/src/backend/replication/logical/applyparallelworker.c
index e10f653fde7..012d55e9d3d 100644
--- a/src/backend/replication/logical/applyparallelworker.c
+++ b/src/backend/replication/logical/applyparallelworker.c
@@ -228,11 +228,11 @@ typedef struct ParallelApplyWorkerEntry
 static HTAB *ParallelApplyTxnHash = NULL;
 
 /*
-* A list (pool) of active parallel apply workers. The information for
-* the new worker is added to the list after successfully launching it. The
-* list entry is removed if there are already enough workers in the worker
-* pool at the end of the transaction. For more information about the worker
-* pool, see comments atop this file.
+ * A list (pool) of active parallel apply workers. The information for
+ * the new worker is added to the list after successfully launching it. The
+ * list entry is removed if there are already enough workers in the worker
+ * pool at the end of the transaction. For more information about the worker
+ * pool, see comments atop this file.
  */
 static List *ParallelApplyWorkerPool = NIL;
 
diff --git a/src/backend/replication/logical/launcher.c b/src/backend/replication/logical/launcher.c
index 7adf4dbe0d1..50051dea8c7 100644
--- a/src/backend/replication/logical/launcher.c
+++ b/src/backend/replication/logical/launcher.c
@@ -1180,7 +1180,7 @@ AtEOXact_ApplyLauncher(bool isCommit)
  * This is used to send launcher signal to stop sleeping and process the
  * subscriptions when current transaction commits. Should be used when new
  * tuple was added to the pg_subscription catalog.
-*/
+ */
 void
 ApplyLauncherWakeupAtCommit(void)
 {
diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c
index 817855e2720..4cf4717f764 100644
--- a/src/backend/storage/file/fd.c
+++ b/src/backend/storage/file/fd.c
@@ -1643,7 +1643,7 @@ PathNameOpenFilePerm(const char *fileName, int fileFlags, mode_t fileMode)
  * with PG_TEMP_FILE_PREFIX, so that they can be identified as temporary and
  * deleted at startup by RemovePgTempFiles().  Further subdirectories below
  * that do not need any particular prefix.
-*/
+ */
 void
 PathNameCreateTemporaryDir(const char *basedir, const char *directory)
 {
diff --git a/src/backend/utils/activity/pgstat_io.c b/src/backend/utils/activity/pgstat_io.c
index 2be26e92283..13a5d8e6440 100644
--- a/src/backend/utils/activity/pgstat_io.c
+++ b/src/backend/utils/activity/pgstat_io.c
@@ -331,22 +331,22 @@ pgstat_io_snapshot_cb(void)
 }
 
 /*
-* IO statistics are not collected for all BackendTypes.
-*
-* The following BackendTypes do not participate in the cumulative stats
-* subsystem or do not perform IO on which we currently track:
-* - Dead-end backend because it is not connected to shared memory and
-*   doesn't do any IO
-* - Syslogger because it is not connected to shared memory
-* - Archiver because most relevant archiving IO is delegated to a
-*   specialized command or module
-*
-* Function returns true if BackendType participates in the cumulative stats
-* subsystem for IO and false if it does not.
-*
-* When adding a new BackendType, also consider adding relevant restrictions to
-* pgstat_tracks_io_object() and pgstat_tracks_io_op().
-*/
+ * IO statistics are not collected for all BackendTypes.
+ *
+ * The following BackendTypes do not participate in the cumulative stats
+ * subsystem or do not perform IO on which we currently track:
+ * - Dead-end backend because it is not connected to shared memory and
+ *   doesn't do any IO
+ * - Syslogger because it is not connected to shared memory
+ * - Archiver because most relevant archiving IO is delegated to a
+ *   specialized command or module
+ *
+ * Function returns true if BackendType participates in the cumulative stats
+ * subsystem for IO and false if it does not.
+ *
+ * When adding a new BackendType, also consider adding relevant restrictions to
+ * pgstat_tracks_io_object() and pgstat_tracks_io_op().
+ */
 bool
 pgstat_tracks_io_bktype(BackendType bktype)
 {
diff --git a/src/backend/utils/adt/formatting.c b/src/backend/utils/adt/formatting.c
index 9a8c99336b5..3ee16447f2f 100644
--- a/src/backend/utils/adt/formatting.c
+++ b/src/backend/utils/adt/formatting.c
@@ -975,8 +975,8 @@ static const KeyWord NUM_keywords[] = {
  */
 static const int DCH_index[KeyWord_INDEX_SIZE] = {
 /*
-0	1	2	3	4	5	6	7	8	9
-*/
+ * 0	1	2	3	4	5	6	7	8	9
+ */
 	/*---- first 0..31 chars are skipped ----*/
 
 	-1, -1, -1, -1, -1, -1, -1, -1,
@@ -998,8 +998,8 @@ static const int DCH_index[KeyWord_INDEX_SIZE] = {
  */
 static const int NUM_index[KeyWord_INDEX_SIZE] = {
 /*
-0	1	2	3	4	5	6	7	8	9
-*/
+ * 0	1	2	3	4	5	6	7	8	9
+ */
 	/*---- first 0..31 chars are skipped ----*/
 
 	-1, -1, -1, -1, -1, -1, -1, -1,
diff --git a/src/backend/utils/adt/geo_ops.c b/src/backend/utils/adt/geo_ops.c
index 4d346f221c9..3ef5344d2ac 100644
--- a/src/backend/utils/adt/geo_ops.c
+++ b/src/backend/utils/adt/geo_ops.c
@@ -2244,8 +2244,8 @@ lseg_length(PG_FUNCTION_ARGS)
  *---------------------------------------------------------*/
 
 /*
- **  find intersection of the two lines, and see if it falls on
- **  both segments.
+ *  find intersection of the two lines, and see if it falls on
+ *  both segments.
  */
 Datum
 lseg_intersect(PG_FUNCTION_ARGS)
diff --git a/src/backend/utils/adt/lockfuncs.c b/src/backend/utils/adt/lockfuncs.c
index dc58e9cb0a6..2899749abe6 100644
--- a/src/backend/utils/adt/lockfuncs.c
+++ b/src/backend/utils/adt/lockfuncs.c
@@ -768,7 +768,7 @@ pg_try_advisory_xact_lock_shared_int8(PG_FUNCTION_ARGS)
  * pg_advisory_unlock(int8) - release exclusive lock on an int8 key
  *
  * Returns true if successful, false if lock was not held
-*/
+ */
 Datum
 pg_advisory_unlock_int8(PG_FUNCTION_ARGS)
 {
@@ -958,7 +958,7 @@ pg_try_advisory_xact_lock_shared_int4(PG_FUNCTION_ARGS)
  * pg_advisory_unlock(int4, int4) - release exclusive lock on 2 int4 keys
  *
  * Returns true if successful, false if lock was not held
-*/
+ */
 Datum
 pg_advisory_unlock_int4(PG_FUNCTION_ARGS)
 {
diff --git a/src/backend/utils/adt/pgstatfuncs.c b/src/backend/utils/adt/pgstatfuncs.c
index 7a9dfa9ba3b..6f9c9c72de5 100644
--- a/src/backend/utils/adt/pgstatfuncs.c
+++ b/src/backend/utils/adt/pgstatfuncs.c
@@ -1337,10 +1337,10 @@ pg_stat_get_buf_alloc(PG_FUNCTION_ARGS)
 }
 
 /*
-* When adding a new column to the pg_stat_io view and the
-* pg_stat_get_backend_io() function, add a new enum value here above
-* IO_NUM_COLUMNS.
-*/
+ * When adding a new column to the pg_stat_io view and the
+ * pg_stat_get_backend_io() function, add a new enum value here above
+ * IO_NUM_COLUMNS.
+ */
 typedef enum io_stat_col
 {
 	IO_COL_INVALID = -1,
diff --git a/src/backend/utils/adt/tsrank.c b/src/backend/utils/adt/tsrank.c
index d35e5528d0a..6b4bf8eb13b 100644
--- a/src/backend/utils/adt/tsrank.c
+++ b/src/backend/utils/adt/tsrank.c
@@ -337,12 +337,12 @@ calc_rank_or(const float *w, TSVector t, TSQuery q)
 				}
 			}
 /*
-			limit (sum(1/i^2),i=1,inf) = pi^2/6
-			resj = sum(wi/i^2),i=1,noccurrence,
-			wi - should be sorted desc,
-			don't sort for now, just choose maximum weight. This should be corrected
-			Oleg Bartunov
-*/
+ * limit (sum(1/i^2),i=1,inf) = pi^2/6
+ * resj = sum(wi/i^2),i=1,noccurrence,
+ * wi - should be sorted desc,
+ * don't sort for now, just choose maximum weight. This should be corrected
+ * Oleg Bartunov
+ */
 			res = res + (wjm + resj - wjm / ((jm + 1) * (jm + 1))) / 1.64493406685;
 
 			entry++;
diff --git a/src/backend/utils/mmgr/bump.c b/src/backend/utils/mmgr/bump.c
index bfb5a114147..9bb579935db 100644
--- a/src/backend/utils/mmgr/bump.c
+++ b/src/backend/utils/mmgr/bump.c
@@ -120,15 +120,15 @@ static inline void BumpBlockFree(BumpContext *set, BumpBlock *block);
 
 
 /*
-* BumpContextCreate
-*		Create a new Bump context.
-*
-* parent: parent context, or NULL if top-level context
-* name: name of context (must be statically allocated)
-* minContextSize: minimum context size
-* initBlockSize: initial allocation block size
-* maxBlockSize: maximum allocation block size
-*/
+ * BumpContextCreate
+ *		Create a new Bump context.
+ *
+ * parent: parent context, or NULL if top-level context
+ * name: name of context (must be statically allocated)
+ * minContextSize: minimum context size
+ * initBlockSize: initial allocation block size
+ * maxBlockSize: maximum allocation block size
+ */
 MemoryContext
 BumpContextCreate(MemoryContext parent, const char *name, Size minContextSize,
 				  Size initBlockSize, Size maxBlockSize)
diff --git a/src/backend/utils/mmgr/slab.c b/src/backend/utils/mmgr/slab.c
index dd1db9566d1..2ad325547fd 100644
--- a/src/backend/utils/mmgr/slab.c
+++ b/src/backend/utils/mmgr/slab.c
@@ -172,7 +172,7 @@ typedef struct SlabBlock
  * SlabChunkIndex
  *		Get the 0-based index of how many chunks into the block the given
  *		chunk is.
-*/
+ */
 #define SlabChunkIndex(slab, block, chunk)	\
 	(((char *) (chunk) - (char *) SlabBlockGetChunk(slab, block, 0)) / \
 	(slab)->fullChunkSize)
diff --git a/src/bin/pg_dump/pg_backup_custom.c b/src/bin/pg_dump/pg_backup_custom.c
index 52990620940..b2062d796f5 100644
--- a/src/bin/pg_dump/pg_backup_custom.c
+++ b/src/bin/pg_dump/pg_backup_custom.c
@@ -193,7 +193,7 @@ InitArchiveFmt_Custom(ArchiveHandle *AH)
  * Optional.
  *
  * Set up extract format-related TOC data.
-*/
+ */
 static void
 _ArchiveEntry(ArchiveHandle *AH, TocEntry *te)
 {
@@ -563,7 +563,7 @@ _PrintTocData(ArchiveHandle *AH, TocEntry *te)
 
 /*
  * Print data from current file position.
-*/
+ */
 static void
 _PrintData(ArchiveHandle *AH)
 {
@@ -617,7 +617,7 @@ _skipLOs(ArchiveHandle *AH)
  * Skip data from current file position.
  * Data blocks are formatted as an integer length, followed by data.
  * A zero length indicates the end of the block.
-*/
+ */
 static void
 _skipData(ArchiveHandle *AH)
 {
diff --git a/src/bin/pg_dump/pg_backup_directory.c b/src/bin/pg_dump/pg_backup_directory.c
index d6a1428c67a..562868cd2ad 100644
--- a/src/bin/pg_dump/pg_backup_directory.c
+++ b/src/bin/pg_dump/pg_backup_directory.c
@@ -193,7 +193,7 @@ InitArchiveFmt_Directory(ArchiveHandle *AH)
  * Called by the Archiver when the dumper creates a new TOC entry.
  *
  * We determine the filename for this entry.
-*/
+ */
 static void
 _ArchiveEntry(ArchiveHandle *AH, TocEntry *te)
 {
@@ -372,7 +372,7 @@ _PrintFileData(ArchiveHandle *AH, char *filename)
 
 /*
  * Print data for a given TOC entry
-*/
+ */
 static void
 _PrintTocData(ArchiveHandle *AH, TocEntry *te)
 {
diff --git a/src/bin/pg_dump/pg_backup_tar.c b/src/bin/pg_dump/pg_backup_tar.c
index a3879410c94..dafaa961924 100644
--- a/src/bin/pg_dump/pg_backup_tar.c
+++ b/src/bin/pg_dump/pg_backup_tar.c
@@ -584,7 +584,7 @@ _PrintFileData(ArchiveHandle *AH, char *filename)
 
 /*
  * Print data for a given TOC entry
-*/
+ */
 static void
 _PrintTocData(ArchiveHandle *AH, TocEntry *te)
 {
diff --git a/src/bin/pg_upgrade/pg_upgrade.h b/src/bin/pg_upgrade/pg_upgrade.h
index 1d767bbda2d..b8c8da3a7b9 100644
--- a/src/bin/pg_upgrade/pg_upgrade.h
+++ b/src/bin/pg_upgrade/pg_upgrade.h
@@ -318,7 +318,7 @@ typedef struct
 
 /*
  *	LogOpts
-*/
+ */
 typedef struct
 {
 	FILE	   *internal;		/* internal log FILE */
@@ -335,7 +335,7 @@ typedef struct
 
 /*
  *	UserOpts
-*/
+ */
 typedef struct
 {
 	bool		check;			/* check clusters only, don't change any data */
diff --git a/src/bin/pgbench/pgbench.c b/src/bin/pgbench/pgbench.c
index c969afab3a5..69b12a919a4 100644
--- a/src/bin/pgbench/pgbench.c
+++ b/src/bin/pgbench/pgbench.c
@@ -239,7 +239,7 @@ static int64 random_seed = -1;
 
 /*
  * end of configurable parameters
- *********************************************************************/
+ */
 
 #define nbranches	1			/* Makes little sense to change this.  Change
 								 * -s instead */
diff --git a/src/bin/psql/stringutils.h b/src/bin/psql/stringutils.h
index 01c2f79e597..0d9fe602b53 100644
--- a/src/bin/psql/stringutils.h
+++ b/src/bin/psql/stringutils.h
@@ -8,8 +8,10 @@
 #ifndef STRINGUTILS_H
 #define STRINGUTILS_H
 
-/* The cooler version of strtok() which knows about quotes and doesn't
- * overwrite your input */
+/*
+ * The cooler version of strtok() which knows about quotes and doesn't
+ * overwrite your input
+ */
 extern char *strtokx(const char *s,
 					 const char *whitespace,
 					 const char *delim,
diff --git a/src/common/jsonapi.c b/src/common/jsonapi.c
index 12e40f2d564..d3860197dad 100644
--- a/src/common/jsonapi.c
+++ b/src/common/jsonapi.c
@@ -300,7 +300,7 @@ static JsonIncrementalState failed_inc_oom;
  * lex_peek
  *
  * what is the current look_ahead token?
-*/
+ */
 static inline JsonTokenType
 lex_peek(JsonLexContext *lex)
 {
diff --git a/src/include/common/hashfn_unstable.h b/src/include/common/hashfn_unstable.h
index 06bdf6d5866..5248446bd58 100644
--- a/src/include/common/hashfn_unstable.h
+++ b/src/include/common/hashfn_unstable.h
@@ -22,30 +22,31 @@
  * notice follows:
  */
 
-/* The MIT License
-
-   Copyright (C) 2012 Zilong Tan (eric.zltan@gmail.com)
-
-   Permission is hereby granted, free of charge, to any person
-   obtaining a copy of this software and associated documentation
-   files (the "Software"), to deal in the Software without
-   restriction, including without limitation the rights to use, copy,
-   modify, merge, publish, distribute, sublicense, and/or sell copies
-   of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be
-   included in all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-   SOFTWARE.
-*/
+/*
+ * The MIT License
+ *
+ * Copyright (C) 2012 Zilong Tan (eric.zltan@gmail.com)
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy,
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
 
 /*
  * fasthash as implemented here has two interfaces:
diff --git a/src/include/libpq/pg-gssapi.h b/src/include/libpq/pg-gssapi.h
index 094ae924e82..d64f2da1515 100644
--- a/src/include/libpq/pg-gssapi.h
+++ b/src/include/libpq/pg-gssapi.h
@@ -27,12 +27,12 @@
 /* IWYU pragma: end_exports */
 
 /*
-* On Windows, <wincrypt.h> includes a #define for X509_NAME, which breaks our
-* ability to use OpenSSL's version of that symbol if <wincrypt.h> is pulled
-* in after <openssl/ssl.h> ... and, at least on some builds, it is.  We
-* can't reliably fix that by re-ordering #includes, because libpq/libpq-be.h
-* #includes <openssl/ssl.h>.  Instead, just zap the #define again here.
-*/
+ * On Windows, <wincrypt.h> includes a #define for X509_NAME, which breaks our
+ * ability to use OpenSSL's version of that symbol if <wincrypt.h> is pulled
+ * in after <openssl/ssl.h> ... and, at least on some builds, it is.  We
+ * can't reliably fix that by re-ordering #includes, because libpq/libpq-be.h
+ * #includes <openssl/ssl.h>.  Instead, just zap the #define again here.
+ */
 #ifdef X509_NAME
 #undef X509_NAME
 #endif
diff --git a/src/include/optimizer/geqo.h b/src/include/optimizer/geqo.h
index 890b47d281b..fa6ff550edb 100644
--- a/src/include/optimizer/geqo.h
+++ b/src/include/optimizer/geqo.h
@@ -11,12 +11,13 @@
  *-------------------------------------------------------------------------
  */
 
-/* contributed by:
-   =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
-   *  Martin Utesch				 * Institute of Automatic Control	   *
-   =							 = University of Mining and Technology =
-   *  utesch@aut.tu-freiberg.de  * Freiberg, Germany				   *
-   =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
+/*
+ * contributed by:
+ * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
+ *  Martin Utesch				 * Institute of Automatic Control	   *
+ * =							 = University of Mining and Technology =
+ *  utesch@aut.tu-freiberg.de  * Freiberg, Germany				   *
+ * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
  */
 
 #ifndef GEQO_H
@@ -30,17 +31,17 @@
 
 /* GEQO debug flag */
 /*
- #define GEQO_DEBUG
+ * #define GEQO_DEBUG
  */
 
 /* choose one recombination mechanism here */
 /*
- #define ERX
- #define PMX
- #define CX
- #define PX
- #define OX1
- #define OX2
+ * #define ERX
+ * #define PMX
+ * #define CX
+ * #define PX
+ * #define OX1
+ * #define OX2
  */
 #define ERX
 
diff --git a/src/include/optimizer/geqo_copy.h b/src/include/optimizer/geqo_copy.h
index 55e0d535812..6bf1b72fbf1 100644
--- a/src/include/optimizer/geqo_copy.h
+++ b/src/include/optimizer/geqo_copy.h
@@ -11,12 +11,13 @@
  *-------------------------------------------------------------------------
  */
 
-/* contributed by:
-   =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
-   *  Martin Utesch				 * Institute of Automatic Control	   *
-   =							 = University of Mining and Technology =
-   *  utesch@aut.tu-freiberg.de  * Freiberg, Germany				   *
-   =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
+/*
+ * contributed by:
+ * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
+ *  Martin Utesch				 * Institute of Automatic Control	   *
+ * =							 = University of Mining and Technology =
+ *  utesch@aut.tu-freiberg.de  * Freiberg, Germany				   *
+ * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
  */
 
 #ifndef GEQO_COPY_H
diff --git a/src/include/optimizer/geqo_gene.h b/src/include/optimizer/geqo_gene.h
index 408462db666..0fd46fdaf48 100644
--- a/src/include/optimizer/geqo_gene.h
+++ b/src/include/optimizer/geqo_gene.h
@@ -11,12 +11,13 @@
  *-------------------------------------------------------------------------
  */
 
-/* contributed by:
-   =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
-   *  Martin Utesch				 * Institute of Automatic Control	   *
-   =							 = University of Mining and Technology =
-   *  utesch@aut.tu-freiberg.de  * Freiberg, Germany				   *
-   =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
+/*
+ * contributed by:
+ * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
+ *  Martin Utesch				 * Institute of Automatic Control	   *
+ * =							 = University of Mining and Technology =
+ *  utesch@aut.tu-freiberg.de  * Freiberg, Germany				   *
+ * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
  */
 
 
@@ -25,8 +26,10 @@
 
 #include "nodes/nodes.h"
 
-/* we presume that int instead of Relid
-   is o.k. for Gene; so don't change it! */
+/*
+ * we presume that int instead of Relid
+ * is o.k. for Gene; so don't change it!
+ */
 typedef int Gene;
 
 typedef struct Chromosome
diff --git a/src/include/optimizer/geqo_misc.h b/src/include/optimizer/geqo_misc.h
index 0525bea5547..dd877c6cb48 100644
--- a/src/include/optimizer/geqo_misc.h
+++ b/src/include/optimizer/geqo_misc.h
@@ -11,12 +11,13 @@
  *-------------------------------------------------------------------------
  */
 
-/* contributed by:
-   =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
-   *  Martin Utesch				 * Institute of Automatic Control	   *
-   =							 = University of Mining and Technology =
-   *  utesch@aut.tu-freiberg.de  * Freiberg, Germany				   *
-   =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
+/*
+ * contributed by:
+ * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
+ *  Martin Utesch				 * Institute of Automatic Control	   *
+ * =							 = University of Mining and Technology =
+ *  utesch@aut.tu-freiberg.de  * Freiberg, Germany				   *
+ * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
  */
 
 #ifndef GEQO_MISC_H
diff --git a/src/include/optimizer/geqo_mutation.h b/src/include/optimizer/geqo_mutation.h
index a433da0ae0f..170d473b8f7 100644
--- a/src/include/optimizer/geqo_mutation.h
+++ b/src/include/optimizer/geqo_mutation.h
@@ -11,12 +11,13 @@
  *-------------------------------------------------------------------------
  */
 
-/* contributed by:
-   =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
-   *  Martin Utesch				 * Institute of Automatic Control	   *
-   =							 = University of Mining and Technology =
-   *  utesch@aut.tu-freiberg.de  * Freiberg, Germany				   *
-   =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
+/*
+ * contributed by:
+ * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
+ *  Martin Utesch				 * Institute of Automatic Control	   *
+ * =							 = University of Mining and Technology =
+ *  utesch@aut.tu-freiberg.de  * Freiberg, Germany				   *
+ * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
  */
 
 #ifndef GEQO_MUTATION_H
diff --git a/src/include/optimizer/geqo_pool.h b/src/include/optimizer/geqo_pool.h
index bd3de6248a7..1b60dcaf5c8 100644
--- a/src/include/optimizer/geqo_pool.h
+++ b/src/include/optimizer/geqo_pool.h
@@ -11,12 +11,13 @@
  *-------------------------------------------------------------------------
  */
 
-/* contributed by:
-   =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
-   *  Martin Utesch				 * Institute of Automatic Control	   *
-   =							 = University of Mining and Technology =
-   *  utesch@aut.tu-freiberg.de  * Freiberg, Germany				   *
-   =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
+/*
+ * contributed by:
+ * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
+ *  Martin Utesch				 * Institute of Automatic Control	   *
+ * =							 = University of Mining and Technology =
+ *  utesch@aut.tu-freiberg.de  * Freiberg, Germany				   *
+ * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
  */
 
 
diff --git a/src/include/optimizer/geqo_random.h b/src/include/optimizer/geqo_random.h
index a6f34d2ba5f..4ce86e21220 100644
--- a/src/include/optimizer/geqo_random.h
+++ b/src/include/optimizer/geqo_random.h
@@ -11,12 +11,13 @@
  *-------------------------------------------------------------------------
  */
 
-/* contributed by:
-   =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
-   *  Martin Utesch				 * Institute of Automatic Control	   *
-   =							 = University of Mining and Technology =
-   *  utesch@aut.tu-freiberg.de  * Freiberg, Germany				   *
-   =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
+/*
+ * contributed by:
+ * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
+ *  Martin Utesch				 * Institute of Automatic Control	   *
+ * =							 = University of Mining and Technology =
+ *  utesch@aut.tu-freiberg.de  * Freiberg, Germany				   *
+ * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
  */
 
 /* -- parts of this are adapted from D. Whitley's Genitor algorithm -- */
diff --git a/src/include/optimizer/geqo_recombination.h b/src/include/optimizer/geqo_recombination.h
index 1c07c923490..8420c0517b6 100644
--- a/src/include/optimizer/geqo_recombination.h
+++ b/src/include/optimizer/geqo_recombination.h
@@ -11,12 +11,13 @@
  *-------------------------------------------------------------------------
  */
 
-/* contributed by:
-   =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
-   *  Martin Utesch				 * Institute of Automatic Control	   *
-   =							 = University of Mining and Technology =
-   *  utesch@aut.tu-freiberg.de  * Freiberg, Germany				   *
-   =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
+/*
+ * contributed by:
+ * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
+ *  Martin Utesch				 * Institute of Automatic Control	   *
+ * =							 = University of Mining and Technology =
+ *  utesch@aut.tu-freiberg.de  * Freiberg, Germany				   *
+ * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
  */
 
 /* -- parts of this are adapted from D. Whitley's Genitor algorithm -- */
diff --git a/src/include/optimizer/geqo_selection.h b/src/include/optimizer/geqo_selection.h
index a1e82d88f60..d07a507d3f3 100644
--- a/src/include/optimizer/geqo_selection.h
+++ b/src/include/optimizer/geqo_selection.h
@@ -11,12 +11,13 @@
  *-------------------------------------------------------------------------
  */
 
-/* contributed by:
-   =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
-   *  Martin Utesch				 * Institute of Automatic Control	   *
-   =							 = University of Mining and Technology =
-   *  utesch@aut.tu-freiberg.de  * Freiberg, Germany				   *
-   =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
+/*
+ * contributed by:
+ * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
+ *  Martin Utesch				 * Institute of Automatic Control	   *
+ * =							 = University of Mining and Technology =
+ *  utesch@aut.tu-freiberg.de  * Freiberg, Germany				   *
+ * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
  */
 
 
diff --git a/src/include/postgres.h b/src/include/postgres.h
index 87f6bd49499..660c1791a8e 100644
--- a/src/include/postgres.h
+++ b/src/include/postgres.h
@@ -552,7 +552,7 @@ Float8GetDatum(float8 X)
  *
  * This enum can be used for values that want to distinguish between true,
  * false, and unset.
-*/
+ */
 typedef enum pg_ternary
 {
 	PG_TERNARY_FALSE = 0,
diff --git a/src/interfaces/ecpg/compatlib/informix.c b/src/interfaces/ecpg/compatlib/informix.c
index ca11a81f1bc..6faa1dced88 100644
--- a/src/interfaces/ecpg/compatlib/informix.c
+++ b/src/interfaces/ecpg/compatlib/informix.c
@@ -520,11 +520,11 @@ rdatestr(date d, char *str)
 }
 
 /*
-*
-* the input for this function is mmddyyyy and any non-numeric
-* character can be used as a separator
-*
-*/
+ *
+ * the input for this function is mmddyyyy and any non-numeric
+ * character can be used as a separator
+ *
+ */
 int
 rstrdate(const char *str, date * d)
 {
diff --git a/src/interfaces/ecpg/ecpglib/ecpglib_extern.h b/src/interfaces/ecpg/ecpglib/ecpglib_extern.h
index c92f0aa1081..afbcfc29f8f 100644
--- a/src/interfaces/ecpg/ecpglib/ecpglib_extern.h
+++ b/src/interfaces/ecpg/ecpglib/ecpglib_extern.h
@@ -239,8 +239,10 @@ extern char *ecpg_gettext(const char *msgid) pg_attribute_format_arg(1);
 #define ecpg_gettext(x) (x)
 #endif
 
-/* SQLSTATE values generated or processed by ecpglib (intentionally
- * not exported -- users should refer to the codes directly) */
+/*
+ * SQLSTATE values generated or processed by ecpglib (intentionally
+ * not exported -- users should refer to the codes directly)
+ */
 
 #define ECPG_SQLSTATE_NO_DATA				"02000"
 #define ECPG_SQLSTATE_USING_CLAUSE_DOES_NOT_MATCH_PARAMETERS	"07001"
diff --git a/src/interfaces/ecpg/ecpglib/execute.c b/src/interfaces/ecpg/ecpglib/execute.c
index ba41732dec6..b6f99e6bb57 100644
--- a/src/interfaces/ecpg/ecpglib/execute.c
+++ b/src/interfaces/ecpg/ecpglib/execute.c
@@ -5,13 +5,16 @@
  * All the tedious messing around with tuples is supposed to be hidden
  * by this function.
  */
-/* Author: Linus Tolke
-   (actually most if the code is "borrowed" from the distribution and just
-   slightly modified)
+/*
+ * Author: Linus Tolke
+ * (actually most if the code is "borrowed" from the distribution and just
+ * slightly modified)
  */
 
-/* Taken over as part of PostgreSQL by Michael Meskes <meskes@postgresql.org>
-   on Feb. 5th, 1998 */
+/*
+ * Taken over as part of PostgreSQL by Michael Meskes <meskes@postgresql.org>
+ * on Feb. 5th, 1998
+ */
 
 #define POSTGRES_ECPG_INTERNAL
 #include "postgres_fe.h"
diff --git a/src/interfaces/ecpg/include/ecpgerrno.h b/src/interfaces/ecpg/include/ecpgerrno.h
index b5b0c087b59..6928d44ee99 100644
--- a/src/interfaces/ecpg/include/ecpgerrno.h
+++ b/src/interfaces/ecpg/include/ecpgerrno.h
@@ -53,8 +53,10 @@
 #define ECPG_DUPLICATE_KEY		-403
 #define ECPG_SUBSELECT_NOT_ONE		-404
 
-/* for compatibility we define some different error codes for the same error
- * if adding a new one make sure to not double define it */
+/*
+ * for compatibility we define some different error codes for the same error
+ * if adding a new one make sure to not double define it
+ */
 #define ECPG_INFORMIX_DUPLICATE_KEY -239
 #define ECPG_INFORMIX_SUBSELECT_NOT_ONE -284
 
diff --git a/src/interfaces/ecpg/pgtypeslib/dt_common.c b/src/interfaces/ecpg/pgtypeslib/dt_common.c
index cf137b42139..3ed5ad06c06 100644
--- a/src/interfaces/ecpg/pgtypeslib/dt_common.c
+++ b/src/interfaces/ecpg/pgtypeslib/dt_common.c
@@ -2357,10 +2357,12 @@ DecodeDateTime(char **field, int *ftype, int nf,
 	return 0;
 }								/* DecodeDateTime() */
 
-/* Function works as follows:
+/*
+ * Function works as follows:
+ *
  *
  *
- * */
+ */
 
 static char *
 find_end_token(char *str, char *fmt)
diff --git a/src/interfaces/ecpg/pgtypeslib/pgtypeslib_extern.h b/src/interfaces/ecpg/pgtypeslib/pgtypeslib_extern.h
index 8e980966b0e..ce2f14fab76 100644
--- a/src/interfaces/ecpg/pgtypeslib/pgtypeslib_extern.h
+++ b/src/interfaces/ecpg/pgtypeslib/pgtypeslib_extern.h
@@ -5,8 +5,10 @@
 
 #include "pgtypes_error.h"
 
-/* These are the constants that decide which printf() format we'll use in
- * order to get a string representation of the value */
+/*
+ * These are the constants that decide which printf() format we'll use in
+ * order to get a string representation of the value
+ */
 #define PGTYPES_TYPE_NOTHING			0
 #define PGTYPES_TYPE_STRING_MALLOCED		1
 #define PGTYPES_TYPE_STRING_CONSTANT		2
diff --git a/src/interfaces/ecpg/pgtypeslib/timestamp.c b/src/interfaces/ecpg/pgtypeslib/timestamp.c
index bc929c0c705..46cd20974eb 100644
--- a/src/interfaces/ecpg/pgtypeslib/timestamp.c
+++ b/src/interfaces/ecpg/pgtypeslib/timestamp.c
@@ -182,9 +182,11 @@ timestamp2tm(timestamp dt, int *tzp, struct tm *tm, fsec_t *fsec, const char **t
 	return 0;
 }								/* timestamp2tm() */
 
-/* EncodeSpecialTimestamp()
+/*
+ * EncodeSpecialTimestamp()
  *	* Convert reserved timestamp data type to string.
- *	 */
+ *
+ */
 static void
 EncodeSpecialTimestamp(timestamp dt, char *str)
 {
@@ -843,14 +845,14 @@ PGTYPEStimestamp_defmt_asc(const char *str, const char *fmt, timestamp * d)
 }
 
 /*
-* add an interval to a time stamp
-*
-*	*tout = tin + span
-*
-*	 returns 0 if successful
-*	 returns -1 if it fails
-*
-*/
+ * add an interval to a time stamp
+ *
+ *	*tout = tin + span
+ *
+ *	 returns 0 if successful
+ *	 returns -1 if it fails
+ *
+ */
 
 int
 PGTYPEStimestamp_add_interval(timestamp * tin, interval * span, timestamp * tout)
@@ -898,14 +900,14 @@ PGTYPEStimestamp_add_interval(timestamp * tin, interval * span, timestamp * tout
 
 
 /*
-* subtract an interval from a time stamp
-*
-*	*tout = tin - span
-*
-*	 returns 0 if successful
-*	 returns -1 if it fails
-*
-*/
+ * subtract an interval from a time stamp
+ *
+ *	*tout = tin - span
+ *
+ *	 returns 0 if successful
+ *	 returns -1 if it fails
+ *
+ */
 
 int
 PGTYPEStimestamp_sub_interval(timestamp * tin, interval * span, timestamp * tout)
diff --git a/src/interfaces/ecpg/preproc/descriptor.c b/src/interfaces/ecpg/preproc/descriptor.c
index e8c7016bdc1..fb3ac99cd0c 100644
--- a/src/interfaces/ecpg/preproc/descriptor.c
+++ b/src/interfaces/ecpg/preproc/descriptor.c
@@ -320,11 +320,12 @@ output_set_descr(const char *desc_name, const char *index)
 	whenever_action(2 | 1);
 }
 
-/* I consider dynamic allocation overkill since at most two descriptor
-   variables are possible per statement. (input and output descriptor)
-   And descriptors are no normal variables, so they don't belong into
-   the variable list.
-*/
+/*
+ * I consider dynamic allocation overkill since at most two descriptor
+ * variables are possible per statement. (input and output descriptor)
+ * And descriptors are no normal variables, so they don't belong into
+ * the variable list.
+ */
 
 #define MAX_DESCRIPTOR_NAMELEN 128
 struct variable *
diff --git a/src/interfaces/ecpg/preproc/type.c b/src/interfaces/ecpg/preproc/type.c
index 9f6dacd2aea..eec87c9cae1 100644
--- a/src/interfaces/ecpg/preproc/type.c
+++ b/src/interfaces/ecpg/preproc/type.c
@@ -194,19 +194,20 @@ get_type(enum ECPGttype type)
 	return NULL;
 }
 
-/* Dump a type.
-   The type is dumped as:
-   type-tag <comma>				   - enum ECPGttype
-   reference-to-variable <comma>		   - char *
-   size <comma>					   - long size of this field (if varchar)
-   arrsize <comma>				   - long number of elements in the arr
-   offset <comma>				   - offset to the next element
-   Where:
-   type-tag is one of the simple types or varchar.
-   reference-to-variable can be a reference to a struct element.
-   arrsize is the size of the array in case of array fetches. Otherwise 0.
-   size is the maxsize in case it is a varchar. Otherwise it is the size of
-   the variable (required to do array fetches of structs).
+/*
+ * Dump a type.
+ * The type is dumped as:
+ * type-tag <comma>				   - enum ECPGttype
+ * reference-to-variable <comma>		   - char *
+ * size <comma>					   - long size of this field (if varchar)
+ * arrsize <comma>				   - long number of elements in the arr
+ * offset <comma>				   - offset to the next element
+ * Where:
+ * type-tag is one of the simple types or varchar.
+ * reference-to-variable can be a reference to a struct element.
+ * arrsize is the size of the array in case of array fetches. Otherwise 0.
+ * size is the maxsize in case it is a varchar. Otherwise it is the size of
+ * the variable (required to do array fetches of structs).
  */
 static void ECPGdump_a_simple(FILE *o, const char *name, enum ECPGttype type,
 							  char *varcharsize,
@@ -382,8 +383,10 @@ ECPGdump_a_type(FILE *o, const char *name, struct ECPGtype *type, const int brac
 }
 
 
-/* If size is NULL, then the offset is 0, if not use size as a
-   string, it represents the offset needed if we are in an array of structs. */
+/*
+ * If size is NULL, then the offset is 0, if not use size as a
+ * string, it represents the offset needed if we are in an array of structs.
+ */
 static void
 ECPGdump_a_simple(FILE *o, const char *name, enum ECPGttype type,
 				  char *varcharsize,
diff --git a/src/interfaces/ecpg/preproc/type.h b/src/interfaces/ecpg/preproc/type.h
index 3d99e1703de..7affe60099d 100644
--- a/src/interfaces/ecpg/preproc/type.h
+++ b/src/interfaces/ecpg/preproc/type.h
@@ -47,15 +47,16 @@ struct ECPGstruct_member *ECPGstruct_member_dup(struct ECPGstruct_member *rm);
 void		ECPGfree_struct_member(struct ECPGstruct_member *rm);
 void		ECPGfree_type(struct ECPGtype *type);
 
-/* Dump a type.
-   The type is dumped as:
-   type-tag <comma> reference-to-variable <comma> arrsize <comma> size <comma>
-   Where:
-   type-tag is one of the simple types or varchar.
-   reference-to-variable can be a reference to a struct element.
-   arrsize is the size of the array in case of array fetches. Otherwise 0.
-   size is the maxsize in case it is a varchar. Otherwise it is the size of
-	   the variable (required to do array fetches of structs).
+/*
+ * Dump a type.
+ * The type is dumped as:
+ * type-tag <comma> reference-to-variable <comma> arrsize <comma> size <comma>
+ * Where:
+ * type-tag is one of the simple types or varchar.
+ * reference-to-variable can be a reference to a struct element.
+ * arrsize is the size of the array in case of array fetches. Otherwise 0.
+ * size is the maxsize in case it is a varchar. Otherwise it is the size of
+ * the variable (required to do array fetches of structs).
  */
 void		ECPGdump_a_type(FILE *o, const char *name, struct ECPGtype *type,
 							const int brace_level, const char *ind_name,
diff --git a/src/interfaces/ecpg/preproc/variable.c b/src/interfaces/ecpg/preproc/variable.c
index ad5201a222f..abfd009c323 100644
--- a/src/interfaces/ecpg/preproc/variable.c
+++ b/src/interfaces/ecpg/preproc/variable.c
@@ -447,9 +447,11 @@ reset_variables(void)
 	argsresult = NULL;
 }
 
-/* Insert a new variable into our request list.
+/*
+ * Insert a new variable into our request list.
  * Note: The list is dumped from the end,
- * so we have to add new entries at the beginning */
+ * so we have to add new entries at the beginning
+ */
 void
 add_variable_to_head(struct arguments **list, struct variable *var, struct variable *ind)
 {
@@ -506,9 +508,10 @@ remove_variable_from_list(struct arguments **list, struct variable *var)
 	}
 }
 
-/* Dump out a list of all the variable on this list.
-   This is a recursive function that works from the end of the list and
-   deletes the list as we go on.
+/*
+ * Dump out a list of all the variable on this list.
+ * This is a recursive function that works from the end of the list and
+ * deletes the list as we go on.
  */
 void
 dump_variables(struct arguments *list, int mode)
diff --git a/src/interfaces/libpq/libpq-fe.h b/src/interfaces/libpq/libpq-fe.h
index afa9b32a6b5..8ecb9b4a4c7 100644
--- a/src/interfaces/libpq/libpq-fe.h
+++ b/src/interfaces/libpq/libpq-fe.h
@@ -440,8 +440,10 @@ extern void *PQsslStruct(PGconn *conn, const char *struct_name);
 extern const char *PQsslAttribute(PGconn *conn, const char *attribute_name);
 extern const char *const *PQsslAttributeNames(PGconn *conn);
 
-/* Get the OpenSSL structure associated with a connection. Returns NULL for
- * unencrypted connections or if any other TLS library is in use. */
+/*
+ * Get the OpenSSL structure associated with a connection. Returns NULL for
+ * unencrypted connections or if any other TLS library is in use.
+ */
 extern void *PQgetssl(PGconn *conn);
 
 /* Tell libpq whether it needs to initialize OpenSSL */
diff --git a/src/pl/plpython/plpython_system.h b/src/pl/plpython/plpython_system.h
index d581518ef0b..1d5c525b020 100644
--- a/src/pl/plpython/plpython_system.h
+++ b/src/pl/plpython/plpython_system.h
@@ -34,8 +34,10 @@
 #define HAVE_SNPRINTF 1
 
 #if defined(_MSC_VER) && defined(_DEBUG)
-/* Python uses #pragma to bring in a non-default libpython on VC++ if
- * _DEBUG is defined */
+/*
+ * Python uses #pragma to bring in a non-default libpython on VC++ if
+ * _DEBUG is defined
+ */
 #undef _DEBUG
 /* Also hide away errcode, since we load Python.h before postgres.h */
 #define errcode __msvc_errcode
diff --git a/src/port/dirmod.c b/src/port/dirmod.c
index 467b50d6f09..f1f33023a3b 100644
--- a/src/port/dirmod.c
+++ b/src/port/dirmod.c
@@ -99,7 +99,7 @@ pgrename(const char *from, const char *to)
  * Check if _pglstat64()'s reason for failure was STATUS_DELETE_PENDING.
  * This doesn't apply to Cygwin, which has its own lstat() that would report
  * the case as EACCES.
-*/
+ */
 static bool
 lstat_error_was_status_delete_pending(void)
 {
diff --git a/src/test/locale/test-ctype.c b/src/test/locale/test-ctype.c
index a3f896c5ecb..36e487277f9 100644
--- a/src/test/locale/test-ctype.c
+++ b/src/test/locale/test-ctype.c
@@ -3,22 +3,22 @@
  */
 
 /*
-
-   test-ctype.c
-
-Written by Oleg BroytMann, phd2@earthling.net
-   with help from Oleg Bartunov, oleg@sai.msu.su
-Copyright (C) 1998 PhiloSoft Design
-
-This is copyrighted but free software. You can use it, modify and distribute
-in original or modified form providing that the author's names and the above
-copyright notice will remain.
-
-Disclaimer, legal notice and absence of warranty.
-   This software provided "as is" without any kind of warranty. In no event
-the author shall be liable for any damage, etc.
-
-*/
+ *
+ * test-ctype.c
+ *
+ * Written by Oleg BroytMann, phd2@earthling.net
+ * with help from Oleg Bartunov, oleg@sai.msu.su
+ * Copyright (C) 1998 PhiloSoft Design
+ *
+ * This is copyrighted but free software. You can use it, modify and distribute
+ * in original or modified form providing that the author's names and the above
+ * copyright notice will remain.
+ *
+ * Disclaimer, legal notice and absence of warranty.
+ * This software provided "as is" without any kind of warranty. In no event
+ * the author shall be liable for any damage, etc.
+ *
+ */
 
 #include <stdio.h>
 #include <locale.h>
diff --git a/src/test/modules/test_tidstore/test_tidstore.c b/src/test/modules/test_tidstore/test_tidstore.c
index bfc40bce24c..60446e484d3 100644
--- a/src/test/modules/test_tidstore/test_tidstore.c
+++ b/src/test/modules/test_tidstore/test_tidstore.c
@@ -93,7 +93,7 @@ offsetnumber_cmp(const void *a, const void *b)
  * on TopMemoryContext, otherwise on DSA. Although the tidstore
  * is created on DSA, only the same process can subsequently use
  * the tidstore. The tidstore handle is not shared anywhere.
-*/
+ */
 Datum
 test_create(PG_FUNCTION_ARGS)
 {
diff --git a/src/timezone/zic.c b/src/timezone/zic.c
index 2f36486a350..afc23cd00f6 100644
--- a/src/timezone/zic.c
+++ b/src/timezone/zic.c
@@ -54,9 +54,11 @@ static ptrdiff_t const PTRDIFF_MAX = MAXVAL(ptrdiff_t, TYPE_BIT(ptrdiff_t));
 #define _Alignof(type) offsetof(struct { char a; type b; }, b)
 #endif
 
-/* The type for line numbers.  Use PRIdMAX to format them; formerly
-   there was also "#define PRIdLINENO PRIdMAX" and formats used
-   PRIdLINENO, but xgettext cannot grok that.  */
+/*
+ * The type for line numbers.  Use PRIdMAX to format them; formerly
+ * there was also "#define PRIdLINENO PRIdMAX" and formats used
+ * PRIdLINENO, but xgettext cannot grok that.
+ */
 typedef intmax_t lineno_t;
 
 struct rule
@@ -164,11 +166,13 @@ enum
 {
 PERCENT_Z_LEN_BOUND = sizeof "+995959" - 1};
 
-/* If true, work around a bug in Qt 5.6.1 and earlier, which mishandles
-   TZif files whose POSIX-TZ-style strings contain '<'; see
-   QTBUG-53071 <https://bugreports.qt.io/browse/QTBUG-53071>.  This
-   workaround will no longer be needed when Qt 5.6.1 and earlier are
-   obsolete, say in the year 2021.  */
+/*
+ * If true, work around a bug in Qt 5.6.1 and earlier, which mishandles
+ * TZif files whose POSIX-TZ-style strings contain '<'; see
+ * QTBUG-53071 <https://bugreports.qt.io/browse/QTBUG-53071>.  This
+ * workaround will no longer be needed when Qt 5.6.1 and earlier are
+ * obsolete, say in the year 2021.
+ */
 #ifndef WORK_AROUND_QTBUG_53071
 enum
 {
@@ -569,9 +573,11 @@ usage(FILE *stream, int status)
 	exit(status);
 }
 
-/* Change the working directory to DIR, possibly creating DIR and its
-   ancestors.  After this is done, all files are accessed with names
-   relative to DIR.  */
+/*
+ * Change the working directory to DIR, possibly creating DIR and its
+ * ancestors.  After this is done, all files are accessed with names
+ * relative to DIR.
+ */
 static void
 change_directory(char const *dir)
 {
@@ -599,8 +605,10 @@ change_directory(char const *dir)
 static zic_t const min_time = MINVAL(zic_t, TIME_T_BITS_IN_FILE);
 static zic_t const max_time = MAXVAL(zic_t, TIME_T_BITS_IN_FILE);
 
-/* The minimum, and one less than the maximum, values specified by
-   the -r option.  These default to MIN_TIME and MAX_TIME.  */
+/*
+ * The minimum, and one less than the maximum, values specified by
+ * the -r option.  These default to MIN_TIME and MAX_TIME.
+ */
 static zic_t lo_time = MINVAL(zic_t, TIME_T_BITS_IN_FILE);
 static zic_t hi_time = MAXVAL(zic_t, TIME_T_BITS_IN_FILE);
 
@@ -610,8 +618,10 @@ static zic_t leapexpires = -1;
 /* The time specified by an #expires comment, or negative if no such line.  */
 static zic_t comment_leapexpires = -1;
 
-/* Set the time range of the output to TIMERANGE.
-   Return true if successful.  */
+/*
+ * Set the time range of the output to TIMERANGE.
+ * Return true if successful.
+ */
 static bool
 timerange_option(char *timerange)
 {
@@ -649,9 +659,11 @@ static const char *directory;
 static const char *leapsec;
 static const char *tzdefault;
 
-/* -1 if the TZif output file should be slim, 0 if default, 1 if the
-   output should be fat for backward compatibility.  ZIC_BLOAT_DEFAULT
-   determines the default.  */
+/*
+ * -1 if the TZif output file should be slim, 0 if default, 1 if the
+ * output should be fat for backward compatibility.  ZIC_BLOAT_DEFAULT
+ * determines the default.
+ */
 static int	bloat;
 
 static bool
@@ -1004,8 +1016,10 @@ relname(char const *target, char const *linkname)
 }
 #endif							/* HAVE_SYMLINK */
 
-/* Hard link FROM to TO, following any symbolic links.
-   Return 0 if successful, an error number otherwise.  */
+/*
+ * Hard link FROM to TO, following any symbolic links.
+ * Return 0 if successful, an error number otherwise.
+ */
 static int
 hardlinkerr(char const *target, char const *linkname)
 {
@@ -3534,8 +3548,10 @@ is_alpha(char a)
 	}
 }
 
-/* If A is an uppercase character in the C locale, return its lowercase
-   counterpart.  Otherwise, return A.  */
+/*
+ * If A is an uppercase character in the C locale, return its lowercase
+ * counterpart.  Otherwise, return A.
+ */
 static char
 lowerit(char a)
 {
@@ -3929,10 +3945,12 @@ newabbr(const char *string)
 	charcnt += i;
 }
 
-/* Ensure that the directories of ARGNAME exist, by making any missing
-   ones.  If ANCESTORS, do this only for ARGNAME's ancestors; otherwise,
-   do it for ARGNAME too.  Exit with failure if there is trouble.
-   Do not consider an existing non-directory to be trouble.  */
+/*
+ * Ensure that the directories of ARGNAME exist, by making any missing
+ * ones.  If ANCESTORS, do this only for ARGNAME's ancestors; otherwise,
+ * do it for ARGNAME too.  Exit with failure if there is trouble.
+ * Do not consider an existing non-directory to be trouble.
+ */
 static void
 mkdirs(char const *argname, bool ancestors)
 {
diff --git a/src/tutorial/complex.c b/src/tutorial/complex.c
index 6354ae6aa72..9f4a683884d 100644
--- a/src/tutorial/complex.c
+++ b/src/tutorial/complex.c
@@ -1,11 +1,11 @@
 /*
  * src/tutorial/complex.c
  *
- ******************************************************************************
+ *
  *  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
  *  format for these routines is dictated by Postgres architecture.
-******************************************************************************/
+ */
 
 #include "postgres.h"
 
