diff --git a/contrib/intarray/_int_op.c b/contrib/intarray/_int_op.c
index a706e353c6f..f4e990e08de 100644
--- a/contrib/intarray/_int_op.c
+++ b/contrib/intarray/_int_op.c
@@ -96,7 +96,8 @@ _int_same(PG_FUNCTION_ARGS)
 	PG_RETURN_BOOL(result);
 }
 
-/*	_int_overlap -- does a overlap b?
+/*
+ *	_int_overlap -- does a overlap b?
  */
 Datum
 _int_overlap(PG_FUNCTION_ARGS)
diff --git a/contrib/isn/isn.c b/contrib/isn/isn.c
index bbe4344e6ad..5bf9d668fe0 100644
--- a/contrib/isn/isn.c
+++ b/contrib/isn/isn.c
@@ -933,7 +933,8 @@ _PG_init(void)
 	MarkGUCPrefixReserved("isn");
 }
 
-/* isn_out
+/*
+ * isn_out
  */
 PG_FUNCTION_INFO_V1(isn_out);
 Datum
@@ -949,7 +950,8 @@ isn_out(PG_FUNCTION_ARGS)
 	PG_RETURN_CSTRING(result);
 }
 
-/* ean13_out
+/*
+ * ean13_out
  */
 PG_FUNCTION_INFO_V1(ean13_out);
 Datum
@@ -965,7 +967,8 @@ ean13_out(PG_FUNCTION_ARGS)
 	PG_RETURN_CSTRING(result);
 }
 
-/* ean13_in
+/*
+ * ean13_in
  */
 PG_FUNCTION_INFO_V1(ean13_in);
 Datum
@@ -979,7 +982,8 @@ ean13_in(PG_FUNCTION_ARGS)
 	PG_RETURN_EAN13(result);
 }
 
-/* isbn_in
+/*
+ * isbn_in
  */
 PG_FUNCTION_INFO_V1(isbn_in);
 Datum
@@ -993,7 +997,8 @@ isbn_in(PG_FUNCTION_ARGS)
 	PG_RETURN_EAN13(result);
 }
 
-/* ismn_in
+/*
+ * ismn_in
  */
 PG_FUNCTION_INFO_V1(ismn_in);
 Datum
@@ -1007,7 +1012,8 @@ ismn_in(PG_FUNCTION_ARGS)
 	PG_RETURN_EAN13(result);
 }
 
-/* issn_in
+/*
+ * issn_in
  */
 PG_FUNCTION_INFO_V1(issn_in);
 Datum
@@ -1021,7 +1027,8 @@ issn_in(PG_FUNCTION_ARGS)
 	PG_RETURN_EAN13(result);
 }
 
-/* upc_in
+/*
+ * upc_in
  */
 PG_FUNCTION_INFO_V1(upc_in);
 Datum
@@ -1086,7 +1093,8 @@ upc_cast_from_ean13(PG_FUNCTION_ARGS)
 }
 
 
-/* is_valid - returns false if the "invalid-check-digit-on-input" is set
+/*
+ * is_valid - returns false if the "invalid-check-digit-on-input" is set
  */
 PG_FUNCTION_INFO_V1(is_valid);
 Datum
@@ -1097,7 +1105,8 @@ is_valid(PG_FUNCTION_ARGS)
 	PG_RETURN_BOOL((val & 1) == 0);
 }
 
-/* make_valid - unsets the "invalid-check-digit-on-input" flag
+/*
+ * make_valid - unsets the "invalid-check-digit-on-input" flag
  */
 PG_FUNCTION_INFO_V1(make_valid);
 Datum
@@ -1109,7 +1118,8 @@ make_valid(PG_FUNCTION_ARGS)
 	PG_RETURN_EAN13(val);
 }
 
-/* this function temporarily sets weak input flag
+/*
+ * this function temporarily sets weak input flag
  * (to lose the strictness of check digit acceptance)
  */
 PG_FUNCTION_INFO_V1(accept_weak_input);
diff --git a/contrib/seg/seg.c b/contrib/seg/seg.c
index 972265b1bac..eff8449399a 100644
--- a/contrib/seg/seg.c
+++ b/contrib/seg/seg.c
@@ -2,9 +2,9 @@
  * 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.
+ *  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"
@@ -570,7 +570,8 @@ seg_same(PG_FUNCTION_ARGS)
 	PG_RETURN_BOOL(cmp == 0);
 }
 
-/*	seg_overlap -- does a overlap b?
+/*
+ *	seg_overlap -- does a overlap b?
  */
 Datum
 seg_overlap(PG_FUNCTION_ARGS)
@@ -582,7 +583,8 @@ seg_overlap(PG_FUNCTION_ARGS)
 				   ((b->upper >= a->upper) && (b->lower <= a->upper)));
 }
 
-/*	seg_over_left -- is the right edge of (a) located at or left of the right edge of (b)?
+/*
+ *	seg_over_left -- is the right edge of (a) located at or left of the right edge of (b)?
  */
 Datum
 seg_over_left(PG_FUNCTION_ARGS)
@@ -593,7 +595,8 @@ seg_over_left(PG_FUNCTION_ARGS)
 	PG_RETURN_BOOL(a->upper <= b->upper);
 }
 
-/*	seg_left -- is (a) entirely on the left of (b)?
+/*
+ *	seg_left -- is (a) entirely on the left of (b)?
  */
 Datum
 seg_left(PG_FUNCTION_ARGS)
@@ -604,7 +607,8 @@ seg_left(PG_FUNCTION_ARGS)
 	PG_RETURN_BOOL(a->upper < b->lower);
 }
 
-/*	seg_right -- is (a) entirely on the right of (b)?
+/*
+ *	seg_right -- is (a) entirely on the right of (b)?
  */
 Datum
 seg_right(PG_FUNCTION_ARGS)
@@ -615,7 +619,8 @@ seg_right(PG_FUNCTION_ARGS)
 	PG_RETURN_BOOL(a->lower > b->upper);
 }
 
-/*	seg_over_right -- is the left edge of (a) located at or right of the left edge of (b)?
+/*
+ *	seg_over_right -- is the left edge of (a) located at or right of the left edge of (b)?
  */
 Datum
 seg_over_right(PG_FUNCTION_ARGS)
@@ -1062,7 +1067,8 @@ restore(char *result, float val, int n)
 ** Miscellany
 */
 
-/* find out the number of significant digits in a string representing
+/*
+ * find out the number of significant digits in a string representing
  * a floating point number
  */
 int
diff --git a/contrib/xml2/xpath.c b/contrib/xml2/xpath.c
index 14b9e014d74..7bf477e0c3f 100644
--- a/contrib/xml2/xpath.c
+++ b/contrib/xml2/xpath.c
@@ -232,7 +232,8 @@ pgxmlNodeSetToText(xmlNodeSetPtr nodeset,
 }
 
 
-/* Translate a PostgreSQL "varlena" -i.e. a variable length parameter
+/*
+ * Translate a PostgreSQL "varlena" -i.e. a variable length parameter
  * into the libxml2 representation
  */
 static xmlChar *
diff --git a/src/backend/catalog/aclchk.c b/src/backend/catalog/aclchk.c
index 67424fe3b0c..007ede997c5 100644
--- a/src/backend/catalog/aclchk.c
+++ b/src/backend/catalog/aclchk.c
@@ -3057,7 +3057,8 @@ pg_aclmask(ObjectType objtype, Oid object_oid, AttrNumber attnum, Oid roleid,
 }
 
 
-/* ****************************************************************
+/*
+ * ****************************************************************
  * Exported routines for examining a user's privileges for various objects
  *
  * See aclmask() for a description of the common API for these functions.
diff --git a/src/backend/commands/analyze.c b/src/backend/commands/analyze.c
index 020a5919b84..02eb4819019 100644
--- a/src/backend/commands/analyze.c
+++ b/src/backend/commands/analyze.c
@@ -1880,7 +1880,8 @@ ind_fetch_func(VacAttrStatsP stats, int rownum, bool *isNull)
 }
 
 
-/*==========================================================================
+/*
+ *==========================================================================
  *
  * Code below this point represents the "standard" type-specific statistics
  * analysis algorithms.  This code can be replaced on a per-data-type basis
diff --git a/src/backend/executor/nodeAppend.c b/src/backend/executor/nodeAppend.c
index 85c85569b5e..987358e27fa 100644
--- a/src/backend/executor/nodeAppend.c
+++ b/src/backend/executor/nodeAppend.c
@@ -12,7 +12,8 @@
  *
  *-------------------------------------------------------------------------
  */
-/* INTERFACE ROUTINES
+/*
+ * INTERFACE ROUTINES
  *		ExecInitAppend	- initialize the append node
  *		ExecAppend		- retrieve the next tuple from the node
  *		ExecEndAppend	- shut down the append node
diff --git a/src/backend/executor/nodeBitmapAnd.c b/src/backend/executor/nodeBitmapAnd.c
index 9007dda3802..64092fa8065 100644
--- a/src/backend/executor/nodeBitmapAnd.c
+++ b/src/backend/executor/nodeBitmapAnd.c
@@ -12,7 +12,8 @@
  *
  *-------------------------------------------------------------------------
  */
-/* INTERFACE ROUTINES
+/*
+ * INTERFACE ROUTINES
  *		ExecInitBitmapAnd	- initialize the BitmapAnd node
  *		MultiExecBitmapAnd	- retrieve the result bitmap from the node
  *		ExecEndBitmapAnd	- shut down the BitmapAnd node
diff --git a/src/backend/executor/nodeBitmapOr.c b/src/backend/executor/nodeBitmapOr.c
index 148c80fdae6..b98b96172fe 100644
--- a/src/backend/executor/nodeBitmapOr.c
+++ b/src/backend/executor/nodeBitmapOr.c
@@ -12,7 +12,8 @@
  *
  *-------------------------------------------------------------------------
  */
-/* INTERFACE ROUTINES
+/*
+ * INTERFACE ROUTINES
  *		ExecInitBitmapOr	- initialize the BitmapOr node
  *		MultiExecBitmapOr	- retrieve the result bitmap from the node
  *		ExecEndBitmapOr		- shut down the BitmapOr node
diff --git a/src/backend/executor/nodeMergeAppend.c b/src/backend/executor/nodeMergeAppend.c
index 72eebd50bdf..0173074d85d 100644
--- a/src/backend/executor/nodeMergeAppend.c
+++ b/src/backend/executor/nodeMergeAppend.c
@@ -12,7 +12,8 @@
  *
  *-------------------------------------------------------------------------
  */
-/* INTERFACE ROUTINES
+/*
+ * INTERFACE ROUTINES
  *		ExecInitMergeAppend		- initialize the MergeAppend node
  *		ExecMergeAppend			- retrieve the next tuple from the node
  *		ExecEndMergeAppend		- shut down the MergeAppend node
diff --git a/src/backend/executor/nodeModifyTable.c b/src/backend/executor/nodeModifyTable.c
index 4cb057ca4f9..478cb01783c 100644
--- a/src/backend/executor/nodeModifyTable.c
+++ b/src/backend/executor/nodeModifyTable.c
@@ -12,7 +12,8 @@
  *
  *-------------------------------------------------------------------------
  */
-/* INTERFACE ROUTINES
+/*
+ * INTERFACE ROUTINES
  *		ExecInitModifyTable - initialize the ModifyTable node
  *		ExecModifyTable		- retrieve the next tuple from the node
  *		ExecEndModifyTable	- shut down the ModifyTable node
diff --git a/src/backend/executor/nodeWindowAgg.c b/src/backend/executor/nodeWindowAgg.c
index f52a7aae843..1fd4503850f 100644
--- a/src/backend/executor/nodeWindowAgg.c
+++ b/src/backend/executor/nodeWindowAgg.c
@@ -3336,7 +3336,8 @@ window_gettupleslot(WindowObject winobj, int64 pos, TupleTableSlot *slot)
 	return true;
 }
 
-/* gettuple_eval_partition
+/*
+ * gettuple_eval_partition
  * get tuple in a partition and evaluate the window function's argument
  * expression on it.
  */
diff --git a/src/backend/optimizer/geqo/geqo_copy.c b/src/backend/optimizer/geqo/geqo_copy.c
index 91a03566ddf..7a075d39b1f 100644
--- a/src/backend/optimizer/geqo/geqo_copy.c
+++ b/src/backend/optimizer/geqo/geqo_copy.c
@@ -36,7 +36,8 @@
 #include "postgres.h"
 #include "optimizer/geqo_copy.h"
 
-/* geqo_copy
+/*
+ * geqo_copy
  *
  *	 copies one gene to another
  *
diff --git a/src/backend/optimizer/geqo/geqo_cx.c b/src/backend/optimizer/geqo/geqo_cx.c
index 12cffb66415..0c77b1537df 100644
--- a/src/backend/optimizer/geqo/geqo_cx.c
+++ b/src/backend/optimizer/geqo/geqo_cx.c
@@ -42,7 +42,8 @@
 #include "optimizer/geqo_random.h"
 #include "optimizer/geqo_recombination.h"
 
-/* cx
+/*
+ * cx
  *
  *	 cycle crossover
  */
diff --git a/src/backend/optimizer/geqo/geqo_erx.c b/src/backend/optimizer/geqo/geqo_erx.c
index f11a59e4a28..cd1da609575 100644
--- a/src/backend/optimizer/geqo/geqo_erx.c
+++ b/src/backend/optimizer/geqo/geqo_erx.c
@@ -46,7 +46,8 @@ static Gene gimme_gene(PlannerInfo *root, Edge edge, Edge *edge_table);
 static Gene edge_failure(PlannerInfo *root, Gene *gene, int index, Edge *edge_table, int num_gene);
 
 
-/* alloc_edge_table
+/*
+ * alloc_edge_table
  *
  *	 allocate memory for edge table
  *
@@ -67,7 +68,8 @@ alloc_edge_table(PlannerInfo *root, int num_gene)
 	return edge_table;
 }
 
-/* free_edge_table
+/*
+ * free_edge_table
  *
  *	  deallocate memory of edge table
  *
@@ -78,7 +80,8 @@ free_edge_table(PlannerInfo *root, Edge *edge_table)
 	pfree(edge_table);
 }
 
-/* gimme_edge_table
+/*
+ * gimme_edge_table
  *
  *	 fills a data structure which represents the set of explicit
  *	 edges between points in the (2) input genes
@@ -136,7 +139,8 @@ gimme_edge_table(PlannerInfo *root, Gene *tour1, Gene *tour2,
 	return ((float) (edge_total * 2) / (float) num_gene);
 }
 
-/* gimme_edge
+/*
+ * gimme_edge
  *
  *	  registers edge from city1 to city2 in input edge table
  *
@@ -184,7 +188,8 @@ gimme_edge(PlannerInfo *root, Gene gene1, Gene gene2, Edge *edge_table)
 	return 1;
 }
 
-/* gimme_tour
+/*
+ * gimme_tour
  *
  *	  creates a new tour using edges from the edge table.
  *	  priority is given to "shared" edges (i.e. edges which
@@ -229,7 +234,8 @@ gimme_tour(PlannerInfo *root, Edge *edge_table, Gene *new_gene, int num_gene)
 	return edge_failures;
 }
 
-/* remove_gene
+/*
+ * remove_gene
  *
  *	 removes input gene from edge_table.
  *	 input edge is used
@@ -272,7 +278,8 @@ remove_gene(PlannerInfo *root, Gene gene, Edge edge, Edge *edge_table)
 	}
 }
 
-/* gimme_gene
+/*
+ * gimme_gene
  *
  *	  priority is given to "shared" edges
  *	  (i.e. edges which both genes possess)
@@ -363,7 +370,8 @@ gimme_gene(PlannerInfo *root, Edge edge, Edge *edge_table)
 	return 0;					/* to keep the compiler quiet */
 }
 
-/* edge_failure
+/*
+ * edge_failure
  *
  *	  routine for handling edge failure
  *
diff --git a/src/backend/optimizer/geqo/geqo_misc.c b/src/backend/optimizer/geqo/geqo_misc.c
index 42604385c8f..b856deb4cc5 100644
--- a/src/backend/optimizer/geqo/geqo_misc.c
+++ b/src/backend/optimizer/geqo/geqo_misc.c
@@ -51,7 +51,8 @@ avg_pool(Pool *pool)
 	return cumulative;
 }
 
-/* print_pool
+/*
+ * print_pool
  */
 void
 print_pool(FILE *fp, Pool *pool, int start, int stop)
@@ -83,7 +84,8 @@ print_pool(FILE *fp, Pool *pool, int start, int stop)
 	fflush(fp);
 }
 
-/* print_gen
+/*
+ * print_gen
  *
  *	 printout for chromosome: best, worst, mean, average
  */
diff --git a/src/backend/optimizer/geqo/geqo_ox1.c b/src/backend/optimizer/geqo/geqo_ox1.c
index a5487269778..2bb5dfceeca 100644
--- a/src/backend/optimizer/geqo/geqo_ox1.c
+++ b/src/backend/optimizer/geqo/geqo_ox1.c
@@ -41,7 +41,8 @@
 #include "optimizer/geqo_random.h"
 #include "optimizer/geqo_recombination.h"
 
-/* ox1
+/*
+ * ox1
  *
  *	 position crossover
  */
diff --git a/src/backend/optimizer/geqo/geqo_ox2.c b/src/backend/optimizer/geqo/geqo_ox2.c
index 6b703576f5a..d411d9022a6 100644
--- a/src/backend/optimizer/geqo/geqo_ox2.c
+++ b/src/backend/optimizer/geqo/geqo_ox2.c
@@ -41,7 +41,8 @@
 #include "optimizer/geqo_random.h"
 #include "optimizer/geqo_recombination.h"
 
-/* ox2
+/*
+ * ox2
  *
  *	 position crossover
  */
diff --git a/src/backend/optimizer/geqo/geqo_pmx.c b/src/backend/optimizer/geqo/geqo_pmx.c
index af1cb868391..86826a3b8bc 100644
--- a/src/backend/optimizer/geqo/geqo_pmx.c
+++ b/src/backend/optimizer/geqo/geqo_pmx.c
@@ -41,7 +41,8 @@
 #include "optimizer/geqo_random.h"
 #include "optimizer/geqo_recombination.h"
 
-/* pmx
+/*
+ * pmx
  *
  *	 partially matched crossover
  */
diff --git a/src/backend/optimizer/geqo/geqo_pool.c b/src/backend/optimizer/geqo/geqo_pool.c
index f330c739d3d..dcec5322b66 100644
--- a/src/backend/optimizer/geqo/geqo_pool.c
+++ b/src/backend/optimizer/geqo/geqo_pool.c
@@ -154,7 +154,8 @@ compare(const void *arg1, const void *arg2)
 		return -1;
 }
 
-/* alloc_chromo
+/*
+ * alloc_chromo
  *	  allocates a chromosome and string space
  */
 Chromosome *
@@ -168,7 +169,8 @@ alloc_chromo(PlannerInfo *root, int string_length)
 	return chromo;
 }
 
-/* free_chromo
+/*
+ * free_chromo
  *	  deallocates a chromosome and string space
  */
 void
@@ -178,7 +180,8 @@ free_chromo(PlannerInfo *root, Chromosome *chromo)
 	pfree(chromo);
 }
 
-/* spread_chromo
+/*
+ * spread_chromo
  *	 inserts a new chromosome into the pool, displacing worst gene in pool
  *	 assumes best->worst = smallest->largest
  */
diff --git a/src/backend/optimizer/geqo/geqo_px.c b/src/backend/optimizer/geqo/geqo_px.c
index 662a17c8437..c81bbd1d648 100644
--- a/src/backend/optimizer/geqo/geqo_px.c
+++ b/src/backend/optimizer/geqo/geqo_px.c
@@ -41,7 +41,8 @@
 #include "optimizer/geqo_random.h"
 #include "optimizer/geqo_recombination.h"
 
-/* px
+/*
+ * px
  *
  *	 position crossover
  */
diff --git a/src/backend/optimizer/geqo/geqo_recombination.c b/src/backend/optimizer/geqo/geqo_recombination.c
index 41d35c179e1..528b0dc5fed 100644
--- a/src/backend/optimizer/geqo/geqo_recombination.c
+++ b/src/backend/optimizer/geqo/geqo_recombination.c
@@ -61,7 +61,8 @@ init_tour(PlannerInfo *root, Gene *tour, int num_gene)
 /* city table is used in these recombination methods: */
 #if defined(CX) || defined(PX) || defined(OX1) || defined(OX2)
 
-/* alloc_city_table
+/*
+ * alloc_city_table
  *
  *	 allocate memory for city table
  */
@@ -79,7 +80,8 @@ alloc_city_table(PlannerInfo *root, int num_gene)
 	return city_table;
 }
 
-/* free_city_table
+/*
+ * free_city_table
  *
  *	  deallocate memory of city table
  */
diff --git a/src/backend/parser/parse_clause.c b/src/backend/parser/parse_clause.c
index 4270c2382c4..5fe5257b019 100644
--- a/src/backend/parser/parse_clause.c
+++ b/src/backend/parser/parse_clause.c
@@ -301,7 +301,8 @@ extractRemainingColumns(ParseState *pstate,
 	return colcount;
 }
 
-/* transformJoinUsingClause()
+/*
+ * transformJoinUsingClause()
  *	  Build a complete ON clause from a partially-transformed USING list.
  *	  We are given lists of nodes representing left and right match columns.
  *	  Result is a transformed qualification expression.
@@ -361,7 +362,8 @@ transformJoinUsingClause(ParseState *pstate,
 	return result;
 }
 
-/* transformJoinOnClause()
+/*
+ * transformJoinOnClause()
  *	  Transform the qual conditions for JOIN/ON.
  *	  Result is a transformed qualification expression.
  */
diff --git a/src/backend/parser/parse_coerce.c b/src/backend/parser/parse_coerce.c
index 913ca53666f..9edace67e1d 100644
--- a/src/backend/parser/parse_coerce.c
+++ b/src/backend/parser/parse_coerce.c
@@ -2968,7 +2968,8 @@ check_valid_internal_signature(Oid ret_type,
 }
 
 
-/* TypeCategory()
+/*
+ * TypeCategory()
  *		Assign a category to the specified type OID.
  *
  * NB: this must not return TYPCATEGORY_INVALID.
@@ -2985,7 +2986,8 @@ TypeCategory(Oid type)
 }
 
 
-/* IsPreferredType()
+/*
+ * IsPreferredType()
  *		Check if this type is a preferred type for the given category.
  *
  * If category is TYPCATEGORY_INVALID, then we'll return true for preferred
@@ -3006,7 +3008,8 @@ IsPreferredType(TYPCATEGORY category, Oid type)
 }
 
 
-/* IsBinaryCoercible()
+/*
+ * IsBinaryCoercible()
  *		Check if srctype is binary-coercible to targettype.
  *
  * This notion allows us to cheat and directly exchange values without
@@ -3035,7 +3038,8 @@ IsBinaryCoercible(Oid srctype, Oid targettype)
 	return IsBinaryCoercibleWithCast(srctype, targettype, &castoid);
 }
 
-/* IsBinaryCoercibleWithCast()
+/*
+ * IsBinaryCoercibleWithCast()
  *		Check if srctype is binary-coercible to targettype.
  *
  * This variant also returns the OID of the pg_cast entry if one is involved.
diff --git a/src/backend/parser/parse_func.c b/src/backend/parser/parse_func.c
index 35ff6427147..e07e7911f87 100644
--- a/src/backend/parser/parse_func.c
+++ b/src/backend/parser/parse_func.c
@@ -1019,7 +1019,8 @@ func_lookup_failure_details(int fgc_flags, List *argnames, bool proc_call)
 }
 
 
-/* func_match_argtypes()
+/*
+ * func_match_argtypes()
  *
  * Given a list of candidate functions (having the right name and number
  * of arguments) and an array of input datatype OIDs, produce a shortlist of
@@ -1062,7 +1063,8 @@ func_match_argtypes(int nargs,
 }								/* func_match_argtypes() */
 
 
-/* func_select_candidate()
+/*
+ * func_select_candidate()
  *		Given the input argtype array and more than one candidate
  *		for the function, attempt to resolve the conflict.
  *
@@ -1473,7 +1475,8 @@ func_select_candidate(int nargs,
 }								/* func_select_candidate() */
 
 
-/* func_get_detail()
+/*
+ * func_get_detail()
  *
  * Find the named function in the system catalogs.
  *
diff --git a/src/backend/parser/parse_oper.c b/src/backend/parser/parse_oper.c
index 2f218c1ab8b..a7e5c686362 100644
--- a/src/backend/parser/parse_oper.c
+++ b/src/backend/parser/parse_oper.c
@@ -253,7 +253,8 @@ oprfuncid(Operator op)
 }
 
 
-/* binary_oper_exact()
+/*
+ * binary_oper_exact()
  * Check for an "exact" match to the specified operand types.
  *
  * If one operand is an unknown literal, assume it should be taken to be
@@ -300,7 +301,8 @@ binary_oper_exact(List *opname, Oid arg1, Oid arg2)
 }
 
 
-/* oper_select_candidate()
+/*
+ * oper_select_candidate()
  *		Given the input argtype array and one or more candidates
  *		for the operator, attempt to resolve the conflict.
  *
@@ -355,7 +357,8 @@ oper_select_candidate(int nargs,
 }
 
 
-/* oper() -- search for a binary operator
+/*
+ * oper() -- search for a binary operator
  * Given operator name, types of arg1 and arg2, return oper struct.
  *
  * IMPORTANT: the returned operator (if any) is only promised to be
@@ -444,7 +447,8 @@ oper(ParseState *pstate, List *opname, Oid ltypeId, Oid rtypeId,
 	return (Operator) tup;
 }
 
-/* compatible_oper()
+/*
+ * compatible_oper()
  *	given an opname and input datatypes, find a compatible binary operator
  *
  *	This is tighter than oper() because it will not return an operator that
@@ -482,7 +486,8 @@ compatible_oper(ParseState *pstate, List *op, Oid arg1, Oid arg2,
 	return (Operator) NULL;
 }
 
-/* compatible_oper_opid() -- get OID of a binary operator
+/*
+ * compatible_oper_opid() -- get OID of a binary operator
  *
  * This is a convenience routine that extracts only the operator OID
  * from the result of compatible_oper().  InvalidOid is returned if the
@@ -505,7 +510,8 @@ compatible_oper_opid(List *op, Oid arg1, Oid arg2, bool noError)
 }
 
 
-/* left_oper() -- search for a unary left operator (prefix operator)
+/*
+ * left_oper() -- search for a unary left operator (prefix operator)
  * Given operator name and type of arg, return oper struct.
  *
  * IMPORTANT: the returned operator (if any) is only promised to be
diff --git a/src/backend/parser/parse_relation.c b/src/backend/parser/parse_relation.c
index ffd1fdab7a0..43460e4a5a5 100644
--- a/src/backend/parser/parse_relation.c
+++ b/src/backend/parser/parse_relation.c
@@ -3693,7 +3693,8 @@ attnameAttNum(Relation rd, const char *attname, bool sysColOK)
 	return InvalidAttrNumber;
 }
 
-/* specialAttNum()
+/*
+ * specialAttNum()
  *
  * Check attribute name to see if it is "special", e.g. "xmin".
  * - thomas 2000-02-07
diff --git a/src/backend/partitioning/partbounds.c b/src/backend/partitioning/partbounds.c
index 9b4277a4987..983257d00ff 100644
--- a/src/backend/partitioning/partbounds.c
+++ b/src/backend/partitioning/partbounds.c
@@ -5713,7 +5713,7 @@ check_parent_values_in_new_partitions(Relation parent,
  * 3. In case new partitions don't contain the DEFAULT partition and the
  *	  partitioned table does not have the DEFAULT partition, the following
  *	  should be true: the sum of the bounds of new partitions should be equal
- &	  to the bound of the split partition.
+ * &	  to the bound of the split partition.
  *
  * parent:			partitioned table
  * splitPartOid:	split partition Oid
diff --git a/src/backend/utils/adt/cash.c b/src/backend/utils/adt/cash.c
index f0487a60f00..4bf60085c61 100644
--- a/src/backend/utils/adt/cash.c
+++ b/src/backend/utils/adt/cash.c
@@ -164,7 +164,8 @@ cash_div_int64(Cash c, int64 i)
 	return c / i;
 }
 
-/* cash_in()
+/*
+ * cash_in()
  * Convert a string to a cash data type.
  * Format is [$]###[,]###[.##]
  * Examples: 123.45 $123.45 $123,456.78
@@ -380,7 +381,8 @@ cash_in(PG_FUNCTION_ARGS)
 }
 
 
-/* cash_out()
+/*
+ * cash_out()
  * Function to convert cash to a dollars and cents representation, using
  * the lc_monetary locale's formatting.
  */
@@ -684,7 +686,8 @@ cash_cmp(PG_FUNCTION_ARGS)
 }
 
 
-/* cash_pl()
+/*
+ * cash_pl()
  * Add two cash values.
  */
 Datum
@@ -697,7 +700,8 @@ cash_pl(PG_FUNCTION_ARGS)
 }
 
 
-/* cash_mi()
+/*
+ * cash_mi()
  * Subtract two cash values.
  */
 Datum
@@ -710,7 +714,8 @@ cash_mi(PG_FUNCTION_ARGS)
 }
 
 
-/* cash_div_cash()
+/*
+ * cash_div_cash()
  * Divide cash by cash, returning float8.
  */
 Datum
@@ -730,7 +735,8 @@ cash_div_cash(PG_FUNCTION_ARGS)
 }
 
 
-/* cash_mul_flt8()
+/*
+ * cash_mul_flt8()
  * Multiply cash by float8.
  */
 Datum
@@ -743,7 +749,8 @@ cash_mul_flt8(PG_FUNCTION_ARGS)
 }
 
 
-/* flt8_mul_cash()
+/*
+ * flt8_mul_cash()
  * Multiply float8 by cash.
  */
 Datum
@@ -756,7 +763,8 @@ flt8_mul_cash(PG_FUNCTION_ARGS)
 }
 
 
-/* cash_div_flt8()
+/*
+ * cash_div_flt8()
  * Divide cash by float8.
  */
 Datum
@@ -769,7 +777,8 @@ cash_div_flt8(PG_FUNCTION_ARGS)
 }
 
 
-/* cash_mul_flt4()
+/*
+ * cash_mul_flt4()
  * Multiply cash by float4.
  */
 Datum
@@ -782,7 +791,8 @@ cash_mul_flt4(PG_FUNCTION_ARGS)
 }
 
 
-/* flt4_mul_cash()
+/*
+ * flt4_mul_cash()
  * Multiply float4 by cash.
  */
 Datum
@@ -795,7 +805,8 @@ flt4_mul_cash(PG_FUNCTION_ARGS)
 }
 
 
-/* cash_div_flt4()
+/*
+ * cash_div_flt4()
  * Divide cash by float4.
  *
  */
@@ -809,7 +820,8 @@ cash_div_flt4(PG_FUNCTION_ARGS)
 }
 
 
-/* cash_mul_int8()
+/*
+ * cash_mul_int8()
  * Multiply cash by int8.
  */
 Datum
@@ -822,7 +834,8 @@ cash_mul_int8(PG_FUNCTION_ARGS)
 }
 
 
-/* int8_mul_cash()
+/*
+ * int8_mul_cash()
  * Multiply int8 by cash.
  */
 Datum
@@ -834,7 +847,8 @@ int8_mul_cash(PG_FUNCTION_ARGS)
 	PG_RETURN_CASH(cash_mul_int64(c, i));
 }
 
-/* cash_div_int8()
+/*
+ * cash_div_int8()
  * Divide cash by 8-byte integer.
  */
 Datum
@@ -847,7 +861,8 @@ cash_div_int8(PG_FUNCTION_ARGS)
 }
 
 
-/* cash_mul_int4()
+/*
+ * cash_mul_int4()
  * Multiply cash by int4.
  */
 Datum
@@ -860,7 +875,8 @@ cash_mul_int4(PG_FUNCTION_ARGS)
 }
 
 
-/* int4_mul_cash()
+/*
+ * int4_mul_cash()
  * Multiply int4 by cash.
  */
 Datum
@@ -873,7 +889,8 @@ int4_mul_cash(PG_FUNCTION_ARGS)
 }
 
 
-/* cash_div_int4()
+/*
+ * cash_div_int4()
  * Divide cash by 4-byte integer.
  *
  */
@@ -887,7 +904,8 @@ cash_div_int4(PG_FUNCTION_ARGS)
 }
 
 
-/* cash_mul_int2()
+/*
+ * cash_mul_int2()
  * Multiply cash by int2.
  */
 Datum
@@ -899,7 +917,8 @@ cash_mul_int2(PG_FUNCTION_ARGS)
 	PG_RETURN_CASH(cash_mul_int64(c, (int64) s));
 }
 
-/* int2_mul_cash()
+/*
+ * int2_mul_cash()
  * Multiply int2 by cash.
  */
 Datum
@@ -911,7 +930,8 @@ int2_mul_cash(PG_FUNCTION_ARGS)
 	PG_RETURN_CASH(cash_mul_int64(c, (int64) s));
 }
 
-/* cash_div_int2()
+/*
+ * cash_div_int2()
  * Divide cash by int2.
  *
  */
@@ -924,7 +944,8 @@ cash_div_int2(PG_FUNCTION_ARGS)
 	PG_RETURN_CASH(cash_div_int64(c, (int64) s));
 }
 
-/* cashlarger()
+/*
+ * cashlarger()
  * Return larger of two cash values.
  */
 Datum
@@ -939,7 +960,8 @@ cashlarger(PG_FUNCTION_ARGS)
 	PG_RETURN_CASH(result);
 }
 
-/* cashsmaller()
+/*
+ * cashsmaller()
  * Return smaller of two cash values.
  */
 Datum
@@ -954,7 +976,8 @@ cashsmaller(PG_FUNCTION_ARGS)
 	PG_RETURN_CASH(result);
 }
 
-/* cash_words()
+/*
+ * cash_words()
  * This converts an int4 as well but to a representation using words
  * Obviously way North American centric - sorry
  */
@@ -1045,7 +1068,8 @@ cash_words(PG_FUNCTION_ARGS)
 }
 
 
-/* cash_numeric()
+/*
+ * cash_numeric()
  * Convert cash to numeric.
  */
 Datum
@@ -1101,7 +1125,8 @@ cash_numeric(PG_FUNCTION_ARGS)
 	PG_RETURN_DATUM(result);
 }
 
-/* numeric_cash()
+/*
+ * numeric_cash()
  * Convert numeric to cash.
  */
 Datum
@@ -1140,7 +1165,8 @@ numeric_cash(PG_FUNCTION_ARGS)
 	PG_RETURN_CASH(result);
 }
 
-/* int4_cash()
+/*
+ * int4_cash()
  * Convert int4 (int) to cash
  */
 Datum
@@ -1172,7 +1198,8 @@ int4_cash(PG_FUNCTION_ARGS)
 	PG_RETURN_CASH(result);
 }
 
-/* int8_cash()
+/*
+ * int8_cash()
  * Convert int8 (bigint) to cash
  */
 Datum
diff --git a/src/backend/utils/adt/date.c b/src/backend/utils/adt/date.c
index c3327440380..7f746dd84c9 100644
--- a/src/backend/utils/adt/date.c
+++ b/src/backend/utils/adt/date.c
@@ -100,7 +100,8 @@ anytime_typmodout(bool istz, int32 typmod)
  *****************************************************************************/
 
 
-/* date_in()
+/*
+ * date_in()
  * Given date text string, convert to internal date format.
  */
 Datum
@@ -171,7 +172,8 @@ date_in(PG_FUNCTION_ARGS)
 	PG_RETURN_DATEADT(date);
 }
 
-/* date_out()
+/*
+ * date_out()
  * Given internal format date, convert to text string.
  */
 Datum
@@ -539,7 +541,8 @@ date_smaller(PG_FUNCTION_ARGS)
 	PG_RETURN_DATEADT((dateVal1 < dateVal2) ? dateVal1 : dateVal2);
 }
 
-/* Compute difference between two dates in days.
+/*
+ * Compute difference between two dates in days.
  */
 Datum
 date_mi(PG_FUNCTION_ARGS)
@@ -555,7 +558,8 @@ date_mi(PG_FUNCTION_ARGS)
 	PG_RETURN_INT32((int32) (dateVal1 - dateVal2));
 }
 
-/* Add a number of days to a date, giving a new date.
+/*
+ * Add a number of days to a date, giving a new date.
  * Must handle both positive and negative numbers of days.
  */
 Datum
@@ -580,7 +584,8 @@ date_pli(PG_FUNCTION_ARGS)
 	PG_RETURN_DATEADT(result);
 }
 
-/* Subtract a number of days from a date, giving a new date.
+/*
+ * Subtract a number of days from a date, giving a new date.
  */
 Datum
 date_mii(PG_FUNCTION_ARGS)
@@ -1080,7 +1085,8 @@ in_range_date_interval(PG_FUNCTION_ARGS)
 }
 
 
-/* extract_date()
+/*
+ * extract_date()
  * Extract specified field from date type.
  */
 Datum
@@ -1257,7 +1263,8 @@ extract_date(PG_FUNCTION_ARGS)
 }
 
 
-/* Add an interval to a date, giving a new date.
+/*
+ * Add an interval to a date, giving a new date.
  * Must handle both positive and negative intervals.
  *
  * We implement this by promoting the date to timestamp (without time zone)
@@ -1277,7 +1284,8 @@ date_pl_interval(PG_FUNCTION_ARGS)
 							   PointerGetDatum(span));
 }
 
-/* Subtract an interval from a date, giving a new date.
+/*
+ * Subtract an interval from a date, giving a new date.
  * Must handle both positive and negative intervals.
  *
  * We implement this by promoting the date to timestamp (without time zone)
@@ -1297,7 +1305,8 @@ date_mi_interval(PG_FUNCTION_ARGS)
 							   PointerGetDatum(span));
 }
 
-/* date_timestamp()
+/*
+ * date_timestamp()
  * Convert date to timestamp data type.
  */
 Datum
@@ -1313,7 +1322,8 @@ date_timestamp(PG_FUNCTION_ARGS)
 	PG_RETURN_TIMESTAMP(result);
 }
 
-/* timestamp_date()
+/*
+ * timestamp_date()
  * Convert timestamp to date data type.
  */
 Datum
@@ -1375,7 +1385,8 @@ timestamp2date_safe(Timestamp timestamp, Node *escontext)
 }
 
 
-/* date_timestamptz()
+/*
+ * date_timestamptz()
  * Convert date to timestamp with time zone data type.
  */
 Datum
@@ -1392,7 +1403,8 @@ date_timestamptz(PG_FUNCTION_ARGS)
 }
 
 
-/* timestamptz_date()
+/*
+ * timestamptz_date()
  * Convert timestamp with time zone to date data type.
  */
 Datum
@@ -1498,7 +1510,8 @@ time_in(PG_FUNCTION_ARGS)
 	PG_RETURN_TIMEADT(result);
 }
 
-/* tm2time()
+/*
+ * tm2time()
  * Convert a tm structure to a time data type.
  */
 int
@@ -1509,7 +1522,8 @@ tm2time(struct pg_tm *tm, fsec_t fsec, TimeADT *result)
 	return 0;
 }
 
-/* time_overflows()
+/*
+ * time_overflows()
  * Check to see if a broken-down time-of-day is out of range.
  */
 bool
@@ -1533,7 +1547,8 @@ time_overflows(int hour, int min, int sec, fsec_t fsec)
 	return false;
 }
 
-/* float_time_overflows()
+/*
+ * float_time_overflows()
  * Same, when we have seconds + fractional seconds as one "double" value.
  */
 bool
@@ -1568,7 +1583,8 @@ float_time_overflows(int hour, int min, double sec)
 }
 
 
-/* time2tm()
+/*
+ * time2tm()
  * Convert time data type to POSIX time structure.
  *
  * Note that only the hour/min/sec/fractional-sec fields are filled in.
@@ -1685,7 +1701,8 @@ make_time(PG_FUNCTION_ARGS)
 }
 
 
-/* time_support()
+/*
+ * time_support()
  *
  * Planner support function for the time_scale() and timetz_scale()
  * length coercion functions (we need not distinguish them here).
@@ -1706,7 +1723,8 @@ time_support(PG_FUNCTION_ARGS)
 	PG_RETURN_POINTER(ret);
 }
 
-/* time_scale()
+/*
+ * time_scale()
  * Adjust time type for specified scale factor.
  * Used by PostgreSQL type system to stuff columns.
  */
@@ -1723,7 +1741,8 @@ time_scale(PG_FUNCTION_ARGS)
 	PG_RETURN_TIMEADT(result);
 }
 
-/* AdjustTimeForTypmod()
+/*
+ * AdjustTimeForTypmod()
  * Force the precision of the time value to a specified value.
  * Uses *exactly* the same code as in AdjustTimestampForTypmod()
  * but we make a separate copy because those types do not
@@ -1862,7 +1881,8 @@ time_smaller(PG_FUNCTION_ARGS)
 	PG_RETURN_TIMEADT((time1 < time2) ? time1 : time2);
 }
 
-/* overlaps_time() --- implements the SQL OVERLAPS operator.
+/*
+ * overlaps_time() --- implements the SQL OVERLAPS operator.
  *
  * Algorithm is per SQL spec.  This is much harder than you'd think
  * because the spec requires us to deliver a non-null answer in some cases
@@ -1987,7 +2007,8 @@ overlaps_time(PG_FUNCTION_ARGS)
 #undef TIMEADT_LT
 }
 
-/* timestamp_time()
+/*
+ * timestamp_time()
  * Convert timestamp to time data type.
  */
 Datum
@@ -2017,7 +2038,8 @@ timestamp_time(PG_FUNCTION_ARGS)
 	PG_RETURN_TIMEADT(result);
 }
 
-/* timestamptz_time()
+/*
+ * timestamptz_time()
  * Convert timestamptz to time data type.
  */
 Datum
@@ -2048,7 +2070,8 @@ timestamptz_time(PG_FUNCTION_ARGS)
 	PG_RETURN_TIMEADT(result);
 }
 
-/* datetime_timestamp()
+/*
+ * datetime_timestamp()
  * Convert date and time to timestamp data type.
  */
 Datum
@@ -2071,7 +2094,8 @@ datetime_timestamp(PG_FUNCTION_ARGS)
 	PG_RETURN_TIMESTAMP(result);
 }
 
-/* time_interval()
+/*
+ * time_interval()
  * Convert time to interval data type.
  */
 Datum
@@ -2089,7 +2113,8 @@ time_interval(PG_FUNCTION_ARGS)
 	PG_RETURN_INTERVAL_P(result);
 }
 
-/* interval_time()
+/*
+ * interval_time()
  * Convert interval to time data type.
  *
  * This is defined as producing the fractional-day portion of the interval.
@@ -2115,7 +2140,8 @@ interval_time(PG_FUNCTION_ARGS)
 	PG_RETURN_TIMEADT(result);
 }
 
-/* time_mi_time()
+/*
+ * time_mi_time()
  * Subtract two times to produce an interval.
  */
 Datum
@@ -2134,7 +2160,8 @@ time_mi_time(PG_FUNCTION_ARGS)
 	PG_RETURN_INTERVAL_P(result);
 }
 
-/* time_pl_interval()
+/*
+ * time_pl_interval()
  * Add interval to time.
  */
 Datum
@@ -2157,7 +2184,8 @@ time_pl_interval(PG_FUNCTION_ARGS)
 	PG_RETURN_TIMEADT(result);
 }
 
-/* time_mi_interval()
+/*
+ * time_mi_interval()
  * Subtract interval from time.
  */
 Datum
@@ -2222,7 +2250,8 @@ in_range_time_interval(PG_FUNCTION_ARGS)
 }
 
 
-/* time_part() and extract_time()
+/*
+ * time_part() and extract_time()
  * Extract specified field from time type.
  */
 static Datum
@@ -2345,7 +2374,8 @@ extract_time(PG_FUNCTION_ARGS)
  *	 Time With Time Zone ADT
  *****************************************************************************/
 
-/* tm2timetz()
+/*
+ * tm2timetz()
  * Convert a tm structure to a time data type.
  */
 int
@@ -2485,7 +2515,8 @@ timetztypmodout(PG_FUNCTION_ARGS)
 }
 
 
-/* timetz2tm()
+/*
+ * timetz2tm()
  * Convert TIME WITH TIME ZONE data type to POSIX time structure.
  */
 int
@@ -2506,7 +2537,8 @@ timetz2tm(TimeTzADT *time, struct pg_tm *tm, fsec_t *fsec, int *tzp)
 	return 0;
 }
 
-/* timetz_scale()
+/*
+ * timetz_scale()
  * Adjust time type for specified scale factor.
  * Used by PostgreSQL type system to stuff columns.
  */
@@ -2678,7 +2710,8 @@ timetz_smaller(PG_FUNCTION_ARGS)
 	PG_RETURN_TIMETZADT_P(result);
 }
 
-/* timetz_pl_interval()
+/*
+ * timetz_pl_interval()
  * Add interval to timetz.
  */
 Datum
@@ -2705,7 +2738,8 @@ timetz_pl_interval(PG_FUNCTION_ARGS)
 	PG_RETURN_TIMETZADT_P(result);
 }
 
-/* timetz_mi_interval()
+/*
+ * timetz_mi_interval()
  * Subtract interval from timetz.
  */
 Datum
@@ -2774,7 +2808,8 @@ in_range_timetz_interval(PG_FUNCTION_ARGS)
 		PG_RETURN_BOOL(timetz_cmp_internal(val, &sum) >= 0);
 }
 
-/* overlaps_timetz() --- implements the SQL OVERLAPS operator.
+/*
+ * overlaps_timetz() --- implements the SQL OVERLAPS operator.
  *
  * Algorithm is per SQL spec.  This is much harder than you'd think
  * because the spec requires us to deliver a non-null answer in some cases
@@ -2936,7 +2971,8 @@ time_timetz(PG_FUNCTION_ARGS)
 }
 
 
-/* timestamptz_timetz()
+/*
+ * timestamptz_timetz()
  * Convert timestamp to timetz data type.
  */
 Datum
@@ -2965,7 +3001,8 @@ timestamptz_timetz(PG_FUNCTION_ARGS)
 }
 
 
-/* datetimetz_timestamptz()
+/*
+ * datetimetz_timestamptz()
  * Convert date and timetz to timestamp with time zone data type.
  * Timestamp is stored in GMT, so add the time zone
  * stored with the timetz to the result.
@@ -3009,7 +3046,8 @@ datetimetz_timestamptz(PG_FUNCTION_ARGS)
 }
 
 
-/* timetz_part() and extract_timetz()
+/*
+ * timetz_part() and extract_timetz()
  * Extract specified field from time type.
  */
 static Datum
@@ -3141,7 +3179,8 @@ extract_timetz(PG_FUNCTION_ARGS)
 	return timetz_part_common(fcinfo, true);
 }
 
-/* timetz_zone()
+/*
+ * timetz_zone()
  * Encode time with time zone type with specified time zone.
  * Applies DST rules as of the transaction start time.
  */
@@ -3204,7 +3243,8 @@ timetz_zone(PG_FUNCTION_ARGS)
 	PG_RETURN_TIMETZADT_P(result);
 }
 
-/* timetz_izone()
+/*
+ * timetz_izone()
  * Encode time with time zone type with specified time interval as time zone.
  */
 Datum
@@ -3245,7 +3285,8 @@ timetz_izone(PG_FUNCTION_ARGS)
 	PG_RETURN_TIMETZADT_P(result);
 }
 
-/* timetz_at_local()
+/*
+ * timetz_at_local()
  *
  * Unlike for timestamp[tz]_at_local, the type for timetz does not flip between
  * time with/without time zone, so we cannot just call the conversion function.
diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c
index 8f25c15fcfc..04ebc632178 100644
--- a/src/backend/utils/adt/datetime.c
+++ b/src/backend/utils/adt/datetime.c
@@ -739,7 +739,8 @@ ParseFractionalSecond(char *cp, fsec_t *fsec)
 }
 
 
-/* ParseDateTime()
+/*
+ * ParseDateTime()
  *	Break string into tokens based on a date/time context.
  *	Returns 0 if successful, DTERR code if bogus input detected.
  *
@@ -967,7 +968,8 @@ ParseDateTime(const char *timestr, char *workbuf, size_t buflen,
 }
 
 
-/* DecodeDateTime()
+/*
+ * DecodeDateTime()
  * Interpret previously parsed fields for general date and time.
  * Return 0 if full date, 1 if only time, and negative DTERR code if problems.
  * (Currently, all callers treat 1 as an error return too.)
@@ -1589,7 +1591,8 @@ DecodeDateTime(char **field, int *ftype, int nf,
 }
 
 
-/* DetermineTimeZoneOffset()
+/*
+ * DetermineTimeZoneOffset()
  *
  * Given a struct pg_tm in which tm_year, tm_mon, tm_mday, tm_hour, tm_min,
  * and tm_sec fields are set, and a zic-style time zone definition, determine
@@ -1610,7 +1613,8 @@ DetermineTimeZoneOffset(struct pg_tm *tm, pg_tz *tzp)
 }
 
 
-/* DetermineTimeZoneOffsetInternal()
+/*
+ * DetermineTimeZoneOffsetInternal()
  *
  * As above, but also return the actual UTC time imputed to the date/time
  * into *tp.
@@ -1748,7 +1752,8 @@ overflow:
 }
 
 
-/* DetermineTimeZoneAbbrevOffset()
+/*
+ * DetermineTimeZoneAbbrevOffset()
  *
  * Determine the GMT offset and DST flag to be attributed to a dynamic
  * time zone abbreviation, that is one whose meaning has changed over time.
@@ -1795,7 +1800,8 @@ DetermineTimeZoneAbbrevOffset(struct pg_tm *tm, const char *abbr, pg_tz *tzp)
 }
 
 
-/* DetermineTimeZoneAbbrevOffsetTS()
+/*
+ * DetermineTimeZoneAbbrevOffsetTS()
  *
  * As above but the probe time is specified as a TimestampTz (hence, UTC time),
  * and DST status is returned into *isdst rather than into tm->tm_isdst.
@@ -1832,7 +1838,8 @@ DetermineTimeZoneAbbrevOffsetTS(TimestampTz ts, const char *abbr,
 }
 
 
-/* DetermineTimeZoneAbbrevOffsetInternal()
+/*
+ * DetermineTimeZoneAbbrevOffsetInternal()
  *
  * Workhorse for above two functions: work from a pg_time_t probe instant.
  * On success, return GMT offset and DST status into *offset and *isdst.
@@ -1865,7 +1872,8 @@ DetermineTimeZoneAbbrevOffsetInternal(pg_time_t t, const char *abbr, pg_tz *tzp,
 }
 
 
-/* TimeZoneAbbrevIsKnown()
+/*
+ * TimeZoneAbbrevIsKnown()
  *
  * Detect whether the given string is a time zone abbreviation that's known
  * in the specified TZDB timezone, and if so whether it's fixed or varying
@@ -1899,7 +1907,8 @@ TimeZoneAbbrevIsKnown(const char *abbr, pg_tz *tzp,
 }
 
 
-/* DecodeTimeOnly()
+/*
+ * DecodeTimeOnly()
  * Interpret parsed string as time fields only.
  * Returns 0 if successful, DTERR code if bogus input detected.
  *
@@ -2438,7 +2447,8 @@ DecodeTimeOnly(char **field, int *ftype, int nf,
 	return 0;
 }
 
-/* DecodeDate()
+/*
+ * DecodeDate()
  * Decode date string which includes delimiters.
  * Return 0 if okay, a DTERR code if not.
  *
@@ -2554,7 +2564,8 @@ DecodeDate(char *str, int fmask, int *tmask, bool *is2digits,
 	return 0;
 }
 
-/* ValidateDate()
+/*
+ * ValidateDate()
  * Check valid year/month/day values, handle BC and DOY cases
  * Return 0 if okay, a DTERR code if not.
  */
@@ -2630,7 +2641,8 @@ ValidateDate(int fmask, bool isjulian, bool is2digits, bool bc,
 }
 
 
-/* DecodeTimeCommon()
+/*
+ * DecodeTimeCommon()
  * Decode time string which includes delimiters.
  * Return 0 if okay, a DTERR code if not.
  * tmask and itm are output parameters.
@@ -2715,7 +2727,8 @@ DecodeTimeCommon(char *str, int fmask, int range,
 	return 0;
 }
 
-/* DecodeTime()
+/*
+ * DecodeTime()
  * Decode time string which includes delimiters.
  * Return 0 if okay, a DTERR code if not.
  *
@@ -2744,7 +2757,8 @@ DecodeTime(char *str, int fmask, int range,
 	return 0;
 }
 
-/* DecodeTimeForInterval()
+/*
+ * DecodeTimeForInterval()
  * Decode time string which includes delimiters.
  * Return 0 if okay, a DTERR code if not.
  *
@@ -2773,7 +2787,8 @@ DecodeTimeForInterval(char *str, int fmask, int range,
 }
 
 
-/* DecodeNumber()
+/*
+ * DecodeNumber()
  * Interpret plain numeric field as a date value in context.
  * Return 0 if okay, a DTERR code if not.
  */
@@ -2955,7 +2970,8 @@ DecodeNumber(int flen, char *str, bool haveTextMonth, int fmask,
 }
 
 
-/* DecodeNumberField()
+/*
+ * DecodeNumberField()
  * Interpret numeric string as a concatenated date or time field.
  * Return a DTK token (>= 0) if successful, a DTERR code (< 0) if not.
  *
@@ -3049,7 +3065,8 @@ DecodeNumberField(int len, char *str, int fmask,
 }
 
 
-/* DecodeTimezone()
+/*
+ * DecodeTimezone()
  * Interpret string as a numeric timezone.
  *
  * Return 0 if okay (and set *tzp), a DTERR code if not okay.
@@ -3118,7 +3135,8 @@ DecodeTimezone(const char *str, int *tzp)
 }
 
 
-/* DecodeTimezoneAbbrev()
+/*
+ * DecodeTimezoneAbbrev()
  * Interpret string as a timezone abbreviation, if possible.
  *
  * Sets *ftype to an abbreviation type (TZ, DTZ, or DYNTZ), or UNKNOWN_FIELD if
@@ -3231,7 +3249,8 @@ ClearTimeZoneAbbrevCache(void)
 }
 
 
-/* DecodeSpecial()
+/*
+ * DecodeSpecial()
  * Decode text string using lookup table.
  *
  * Recognizes the keywords listed in datetktbl.
@@ -3271,7 +3290,8 @@ DecodeSpecial(int field, const char *lowtoken, int *val)
 }
 
 
-/* DecodeTimezoneName()
+/*
+ * DecodeTimezoneName()
  * Interpret string as a timezone abbreviation or name.
  * Throw error if the name is not recognized.
  *
@@ -3333,7 +3353,8 @@ DecodeTimezoneName(const char *tzname, int *offset, pg_tz **tz)
 	}
 }
 
-/* DecodeTimezoneNameToTz()
+/*
+ * DecodeTimezoneNameToTz()
  * Interpret string as a timezone abbreviation or name.
  * Throw error if the name is not recognized.
  *
@@ -3354,7 +3375,8 @@ DecodeTimezoneNameToTz(const char *tzname)
 	return result;
 }
 
-/* DecodeTimezoneAbbrevPrefix()
+/*
+ * DecodeTimezoneAbbrevPrefix()
  * Interpret prefix of string as a timezone abbreviation, if possible.
  *
  * This has roughly the same functionality as DecodeTimezoneAbbrev(),
@@ -3455,7 +3477,8 @@ DecodeTimezoneAbbrevPrefix(const char *str, int *offset, pg_tz **tz)
 }
 
 
-/* ClearPgItmIn
+/*
+ * ClearPgItmIn
  *
  * Zero out a pg_itm_in
  */
@@ -3469,7 +3492,8 @@ ClearPgItmIn(struct pg_itm_in *itm_in)
 }
 
 
-/* DecodeInterval()
+/*
+ * DecodeInterval()
  * Interpret previously parsed fields for general time interval.
  * Returns 0 if successful, DTERR code if bogus input detected.
  * dtype and itm_in are output parameters.
@@ -3931,7 +3955,8 @@ ISO8601IntegerWidth(char *fieldstart)
 }
 
 
-/* DecodeISO8601Interval()
+/*
+ * DecodeISO8601Interval()
  *	Decode an ISO 8601 time interval of the "format with designators"
  *	(section 4.4.3.2) or "alternative format" (section 4.4.3.3)
  *	Examples:  P1D	for 1 day
@@ -4156,7 +4181,8 @@ DecodeISO8601Interval(char *str,
 }
 
 
-/* DecodeUnits()
+/*
+ * DecodeUnits()
  * Decode text string using lookup table.
  *
  * This routine recognizes keywords associated with time interval units.
@@ -4268,7 +4294,8 @@ DateTimeParseError(int dterr, DateTimeErrorExtra *extra,
 	}
 }
 
-/* datebsearch()
+/*
+ * datebsearch()
  * Binary search -- from Knuth (6.2.1) Algorithm B.  Special case like this
  * is WAY faster than the generic bsearch().
  */
@@ -4302,7 +4329,8 @@ datebsearch(const char *key, const datetkn *base, int nel)
 	return NULL;
 }
 
-/* EncodeTimezone()
+/*
+ * EncodeTimezone()
  *		Copies representation of a numeric timezone offset to str.
  *
  * Returns a pointer to the new end of string.  No NUL terminator is put
@@ -4343,7 +4371,8 @@ EncodeTimezone(char *str, int tz, int style)
 	return str;
 }
 
-/* EncodeDateOnly()
+/*
+ * EncodeDateOnly()
  * Encode date as local time.
  */
 void
@@ -4423,7 +4452,8 @@ EncodeDateOnly(struct pg_tm *tm, int style, char *str)
 }
 
 
-/* EncodeTimeOnly()
+/*
+ * EncodeTimeOnly()
  * Encode time fields only.
  *
  * tm and fsec are the value to encode, print_tz determines whether to include
@@ -4445,7 +4475,8 @@ EncodeTimeOnly(struct pg_tm *tm, fsec_t fsec, bool print_tz, int tz, int style,
 }
 
 
-/* EncodeDateTime()
+/*
+ * EncodeDateTime()
  * Encode date and time interpreted as local time.
  *
  * tm and fsec are the value to encode, print_tz determines whether to include
@@ -4685,7 +4716,8 @@ AddVerboseIntPart(char *cp, int64 value, const char *units,
 }
 
 
-/* EncodeInterval()
+/*
+ * EncodeInterval()
  * Interpret time structure as a delta time and convert to string.
  *
  * Support "traditional Postgres" and ISO-8601 styles.
diff --git a/src/backend/utils/adt/geo_ops.c b/src/backend/utils/adt/geo_ops.c
index cc5ce013d0f..4d346f221c9 100644
--- a/src/backend/utils/adt/geo_ops.c
+++ b/src/backend/utils/adt/geo_ops.c
@@ -413,7 +413,8 @@ pair_count(char *s, char delim)
  * Formatting and conversion routines.
  *---------------------------------------------------------*/
 
-/*		box_in	-		convert a string to internal form.
+/*
+ *		box_in	-		convert a string to internal form.
  *
  *		External format: (two corners of box)
  *				"(f8, f8), (f8, f8)"
@@ -450,7 +451,8 @@ box_in(PG_FUNCTION_ARGS)
 	PG_RETURN_BOX_P(box);
 }
 
-/*		box_out -		convert a box to external form.
+/*
+ *		box_out -		convert a box to external form.
  */
 Datum
 box_out(PG_FUNCTION_ARGS)
@@ -513,7 +515,8 @@ box_send(PG_FUNCTION_ARGS)
 }
 
 
-/*		box_construct	-		fill in a new box.
+/*
+ *		box_construct	-		fill in a new box.
  */
 static inline void
 box_construct(BOX *result, Point *pt1, Point *pt2)
@@ -546,7 +549,8 @@ box_construct(BOX *result, Point *pt1, Point *pt2)
  *		<, >, <=, >=, and == are based on box area.
  *---------------------------------------------------------*/
 
-/*		box_same		-		are two boxes identical?
+/*
+ *		box_same		-		are two boxes identical?
  */
 Datum
 box_same(PG_FUNCTION_ARGS)
@@ -558,7 +562,8 @@ box_same(PG_FUNCTION_ARGS)
 				   point_eq_point(&box1->low, &box2->low));
 }
 
-/*		box_overlap		-		does box1 overlap box2?
+/*
+ *		box_overlap		-		does box1 overlap box2?
  */
 Datum
 box_overlap(PG_FUNCTION_ARGS)
@@ -578,7 +583,8 @@ box_ov(BOX *box1, BOX *box2)
 			FPle(box2->low.y, box1->high.y));
 }
 
-/*		box_left		-		is box1 strictly left of box2?
+/*
+ *		box_left		-		is box1 strictly left of box2?
  */
 Datum
 box_left(PG_FUNCTION_ARGS)
@@ -589,7 +595,8 @@ box_left(PG_FUNCTION_ARGS)
 	PG_RETURN_BOOL(FPlt(box1->high.x, box2->low.x));
 }
 
-/*		box_overleft	-		is the right edge of box1 at or left of
+/*
+ *		box_overleft	-		is the right edge of box1 at or left of
  *								the right edge of box2?
  *
  *		This is "less than or equal" for the end of a time range,
@@ -604,7 +611,8 @@ box_overleft(PG_FUNCTION_ARGS)
 	PG_RETURN_BOOL(FPle(box1->high.x, box2->high.x));
 }
 
-/*		box_right		-		is box1 strictly right of box2?
+/*
+ *		box_right		-		is box1 strictly right of box2?
  */
 Datum
 box_right(PG_FUNCTION_ARGS)
@@ -615,7 +623,8 @@ box_right(PG_FUNCTION_ARGS)
 	PG_RETURN_BOOL(FPgt(box1->low.x, box2->high.x));
 }
 
-/*		box_overright	-		is the left edge of box1 at or right of
+/*
+ *		box_overright	-		is the left edge of box1 at or right of
  *								the left edge of box2?
  *
  *		This is "greater than or equal" for time ranges, when time ranges
@@ -630,7 +639,8 @@ box_overright(PG_FUNCTION_ARGS)
 	PG_RETURN_BOOL(FPge(box1->low.x, box2->low.x));
 }
 
-/*		box_below		-		is box1 strictly below box2?
+/*
+ *		box_below		-		is box1 strictly below box2?
  */
 Datum
 box_below(PG_FUNCTION_ARGS)
@@ -641,7 +651,8 @@ box_below(PG_FUNCTION_ARGS)
 	PG_RETURN_BOOL(FPlt(box1->high.y, box2->low.y));
 }
 
-/*		box_overbelow	-		is the upper edge of box1 at or below
+/*
+ *		box_overbelow	-		is the upper edge of box1 at or below
  *								the upper edge of box2?
  */
 Datum
@@ -653,7 +664,8 @@ box_overbelow(PG_FUNCTION_ARGS)
 	PG_RETURN_BOOL(FPle(box1->high.y, box2->high.y));
 }
 
-/*		box_above		-		is box1 strictly above box2?
+/*
+ *		box_above		-		is box1 strictly above box2?
  */
 Datum
 box_above(PG_FUNCTION_ARGS)
@@ -664,7 +676,8 @@ box_above(PG_FUNCTION_ARGS)
 	PG_RETURN_BOOL(FPgt(box1->low.y, box2->high.y));
 }
 
-/*		box_overabove	-		is the lower edge of box1 at or above
+/*
+ *		box_overabove	-		is the lower edge of box1 at or above
  *								the lower edge of box2?
  */
 Datum
@@ -676,7 +689,8 @@ box_overabove(PG_FUNCTION_ARGS)
 	PG_RETURN_BOOL(FPge(box1->low.y, box2->low.y));
 }
 
-/*		box_contained	-		is box1 contained by box2?
+/*
+ *		box_contained	-		is box1 contained by box2?
  */
 Datum
 box_contained(PG_FUNCTION_ARGS)
@@ -687,7 +701,8 @@ box_contained(PG_FUNCTION_ARGS)
 	PG_RETURN_BOOL(box_contain_box(box2, box1));
 }
 
-/*		box_contain		-		does box1 contain box2?
+/*
+ *		box_contain		-		does box1 contain box2?
  */
 Datum
 box_contain(PG_FUNCTION_ARGS)
@@ -711,7 +726,8 @@ box_contain_box(BOX *contains_box, BOX *contained_box)
 }
 
 
-/*		box_positionop	-
+/*
+ *		box_positionop	-
  *				is box1 entirely {above,below} box2?
  *
  * box_below_eq and box_above_eq are obsolete versions that (probably
@@ -738,7 +754,8 @@ box_above_eq(PG_FUNCTION_ARGS)
 }
 
 
-/*		box_relop		-		is area(box1) relop area(box2), within
+/*
+ *		box_relop		-		is area(box1) relop area(box2), within
  *								our accuracy constraint?
  */
 Datum
@@ -791,7 +808,8 @@ box_ge(PG_FUNCTION_ARGS)
  *	"Arithmetic" operators on boxes.
  *---------------------------------------------------------*/
 
-/*		box_area		-		returns the area of the box.
+/*
+ *		box_area		-		returns the area of the box.
  */
 Datum
 box_area(PG_FUNCTION_ARGS)
@@ -802,7 +820,8 @@ box_area(PG_FUNCTION_ARGS)
 }
 
 
-/*		box_width		-		returns the width of the box
+/*
+ *		box_width		-		returns the width of the box
  *								  (horizontal magnitude).
  */
 Datum
@@ -814,7 +833,8 @@ box_width(PG_FUNCTION_ARGS)
 }
 
 
-/*		box_height		-		returns the height of the box
+/*
+ *		box_height		-		returns the height of the box
  *								  (vertical magnitude).
  */
 Datum
@@ -826,7 +846,8 @@ box_height(PG_FUNCTION_ARGS)
 }
 
 
-/*		box_distance	-		returns the distance between the
+/*
+ *		box_distance	-		returns the distance between the
  *								  center points of two boxes.
  */
 Datum
@@ -844,7 +865,8 @@ box_distance(PG_FUNCTION_ARGS)
 }
 
 
-/*		box_center		-		returns the center point of the box.
+/*
+ *		box_center		-		returns the center point of the box.
  */
 Datum
 box_center(PG_FUNCTION_ARGS)
@@ -860,7 +882,8 @@ box_center(PG_FUNCTION_ARGS)
 }
 
 
-/*		box_ar	-		returns the area of the box.
+/*
+ *		box_ar	-		returns the area of the box.
  */
 static float8
 box_ar(BOX *box)
@@ -869,7 +892,8 @@ box_ar(BOX *box)
 }
 
 
-/*		box_cn	-		stores the centerpoint of the box into *center.
+/*
+ *		box_cn	-		stores the centerpoint of the box into *center.
  */
 static void
 box_cn(Point *center, BOX *box, Node *escontext)
@@ -894,7 +918,8 @@ box_cn(Point *center, BOX *box, Node *escontext)
 		return;
 }
 
-/*		box_wd	-		returns the width (length) of the box
+/*
+ *		box_wd	-		returns the width (length) of the box
  *								  (horizontal magnitude).
  */
 static float8
@@ -904,7 +929,8 @@ box_wd(BOX *box)
 }
 
 
-/*		box_ht	-		returns the height of the box
+/*
+ *		box_ht	-		returns the height of the box
  *								  (vertical magnitude).
  */
 static float8
@@ -918,7 +944,8 @@ box_ht(BOX *box)
  *	Funky operations.
  *---------------------------------------------------------*/
 
-/*		box_intersect	-
+/*
+ *		box_intersect	-
  *				returns the overlapping portion of two boxes,
  *				  or NULL if they do not intersect.
  */
@@ -943,7 +970,8 @@ box_intersect(PG_FUNCTION_ARGS)
 }
 
 
-/*		box_diagonal	-
+/*
+ *		box_diagonal	-
  *				returns a line segment which happens to be the
  *				  positive-slope diagonal of "box".
  */
@@ -1126,7 +1154,8 @@ line_construct(LINE *result, Point *pt, float8 m)
 	}
 }
 
-/* line_construct_pp()
+/*
+ * line_construct_pp()
  * two points
  */
 Datum
@@ -1272,7 +1301,8 @@ line_invsl(LINE *line)
 }
 
 
-/* line_distance()
+/*
+ * line_distance()
  * Distance between two lines.
  */
 Datum
@@ -1297,7 +1327,8 @@ line_distance(PG_FUNCTION_ARGS)
 								hypot(l1->A, l1->B)));
 }
 
-/* line_interpt()
+/*
+ * line_interpt()
  * Point where two lines l1, l2 intersect (if any)
  */
 Datum
@@ -1662,7 +1693,8 @@ path_open(PG_FUNCTION_ARGS)
 }
 
 
-/* path_inter -
+/*
+ * path_inter -
  *		Does p1 intersect p2 at any point?
  *		Use bounding boxes for a quick (O(n)) check, then do a
  *		O(n^2) iterative edge check.
@@ -1740,7 +1772,8 @@ path_inter(PG_FUNCTION_ARGS)
 	PG_RETURN_BOOL(false);
 }
 
-/* path_distance()
+/*
+ * path_distance()
  * This essentially does a cartesian product of the lsegs in the
  *	two paths, and finds the min distance between any two lsegs
  */
@@ -2151,7 +2184,8 @@ lseg_send(PG_FUNCTION_ARGS)
 }
 
 
-/* lseg_construct -
+/*
+ * lseg_construct -
  *		form a LSEG from two Points.
  */
 Datum
@@ -2326,7 +2360,8 @@ lseg_ge(PG_FUNCTION_ARGS)
  *	Line arithmetic routines.
  *---------------------------------------------------------*/
 
-/* lseg_distance -
+/*
+ * lseg_distance -
  *		If two segments don't intersect, then the closest
  *		point will be from one of the endpoints to the other
  *		segment.
@@ -3198,7 +3233,8 @@ box_contain_pt(PG_FUNCTION_ARGS)
 	PG_RETURN_BOOL(box_contain_point(box, pt));
 }
 
-/* on_ppath -
+/*
+ * on_ppath -
  *		Whether a point lies within (on) a polyline.
  *		If open, we have to (groan) check each segment.
  * (uses same algorithm as for point intersecting segment - tgl 1997-07-09)
@@ -3368,7 +3404,8 @@ inter_sb(PG_FUNCTION_ARGS)
 }
 
 
-/* inter_lb()
+/*
+ * inter_lb()
  * Do line and box intersect?
  */
 Datum
@@ -4397,7 +4434,8 @@ boxes_bound_box(PG_FUNCTION_ARGS)
  **
  ***********************************************************************/
 
-/* path_add()
+/*
+ * path_add()
  * Concatenate two paths (only if they are both open).
  */
 Datum
@@ -4445,7 +4483,8 @@ path_add(PG_FUNCTION_ARGS)
 	PG_RETURN_PATH_P(result);
 }
 
-/* path_add_pt()
+/*
+ * path_add_pt()
  * Translation operators.
  */
 Datum
@@ -4474,7 +4513,8 @@ path_sub_pt(PG_FUNCTION_ARGS)
 	PG_RETURN_PATH_P(path);
 }
 
-/* path_mul_pt()
+/*
+ * path_mul_pt()
  * Rotation and scaling operators.
  */
 Datum
@@ -4587,7 +4627,8 @@ poly_box(PG_FUNCTION_ARGS)
 }
 
 
-/* box_poly()
+/*
+ * box_poly()
  * Convert a box to a polygon.
  */
 Datum
@@ -4660,7 +4701,8 @@ poly_path(PG_FUNCTION_ARGS)
  * Formatting and conversion routines.
  *---------------------------------------------------------*/
 
-/*		circle_in		-		convert a string to internal form.
+/*
+ *		circle_in		-		convert a string to internal form.
  *
  *		External format: (center and radius of circle)
  *				"<(f8,f8),f8>"
@@ -4734,7 +4776,8 @@ circle_in(PG_FUNCTION_ARGS)
 	PG_RETURN_CIRCLE_P(circle);
 }
 
-/*		circle_out		-		convert a circle to external form.
+/*
+ *		circle_out		-		convert a circle to external form.
  */
 Datum
 circle_out(PG_FUNCTION_ARGS)
@@ -4801,7 +4844,8 @@ circle_send(PG_FUNCTION_ARGS)
  *		<, >, <=, >=, and == are based on circle area.
  *---------------------------------------------------------*/
 
-/*		circles identical?
+/*
+ *		circles identical?
  *
  * We consider NaNs values to be equal to each other to let those circles
  * to be found.
@@ -4817,7 +4861,8 @@ circle_same(PG_FUNCTION_ARGS)
 				   point_eq_point(&circle1->center, &circle2->center));
 }
 
-/*		circle_overlap	-		does circle1 overlap circle2?
+/*
+ *		circle_overlap	-		does circle1 overlap circle2?
  */
 Datum
 circle_overlap(PG_FUNCTION_ARGS)
@@ -4829,7 +4874,8 @@ circle_overlap(PG_FUNCTION_ARGS)
 						float8_pl(circle1->radius, circle2->radius)));
 }
 
-/*		circle_overleft -		is the right edge of circle1 at or left of
+/*
+ *		circle_overleft -		is the right edge of circle1 at or left of
  *								the right edge of circle2?
  */
 Datum
@@ -4842,7 +4888,8 @@ circle_overleft(PG_FUNCTION_ARGS)
 						float8_pl(circle2->center.x, circle2->radius)));
 }
 
-/*		circle_left		-		is circle1 strictly left of circle2?
+/*
+ *		circle_left		-		is circle1 strictly left of circle2?
  */
 Datum
 circle_left(PG_FUNCTION_ARGS)
@@ -4854,7 +4901,8 @@ circle_left(PG_FUNCTION_ARGS)
 						float8_mi(circle2->center.x, circle2->radius)));
 }
 
-/*		circle_right	-		is circle1 strictly right of circle2?
+/*
+ *		circle_right	-		is circle1 strictly right of circle2?
  */
 Datum
 circle_right(PG_FUNCTION_ARGS)
@@ -4866,7 +4914,8 @@ circle_right(PG_FUNCTION_ARGS)
 						float8_pl(circle2->center.x, circle2->radius)));
 }
 
-/*		circle_overright	-	is the left edge of circle1 at or right of
+/*
+ *		circle_overright	-	is the left edge of circle1 at or right of
  *								the left edge of circle2?
  */
 Datum
@@ -4879,7 +4928,8 @@ circle_overright(PG_FUNCTION_ARGS)
 						float8_mi(circle2->center.x, circle2->radius)));
 }
 
-/*		circle_contained		-		is circle1 contained by circle2?
+/*
+ *		circle_contained		-		is circle1 contained by circle2?
  */
 Datum
 circle_contained(PG_FUNCTION_ARGS)
@@ -4891,7 +4941,8 @@ circle_contained(PG_FUNCTION_ARGS)
 						float8_mi(circle2->radius, circle1->radius)));
 }
 
-/*		circle_contain	-		does circle1 contain circle2?
+/*
+ *		circle_contain	-		does circle1 contain circle2?
  */
 Datum
 circle_contain(PG_FUNCTION_ARGS)
@@ -4904,7 +4955,8 @@ circle_contain(PG_FUNCTION_ARGS)
 }
 
 
-/*		circle_below		-		is circle1 strictly below circle2?
+/*
+ *		circle_below		-		is circle1 strictly below circle2?
  */
 Datum
 circle_below(PG_FUNCTION_ARGS)
@@ -4916,7 +4968,8 @@ circle_below(PG_FUNCTION_ARGS)
 						float8_mi(circle2->center.y, circle2->radius)));
 }
 
-/*		circle_above	-		is circle1 strictly above circle2?
+/*
+ *		circle_above	-		is circle1 strictly above circle2?
  */
 Datum
 circle_above(PG_FUNCTION_ARGS)
@@ -4928,7 +4981,8 @@ circle_above(PG_FUNCTION_ARGS)
 						float8_pl(circle2->center.y, circle2->radius)));
 }
 
-/*		circle_overbelow -		is the upper edge of circle1 at or below
+/*
+ *		circle_overbelow -		is the upper edge of circle1 at or below
  *								the upper edge of circle2?
  */
 Datum
@@ -4941,7 +4995,8 @@ circle_overbelow(PG_FUNCTION_ARGS)
 						float8_pl(circle2->center.y, circle2->radius)));
 }
 
-/*		circle_overabove	-	is the lower edge of circle1 at or above
+/*
+ *		circle_overabove	-	is the lower edge of circle1 at or above
  *								the lower edge of circle2?
  */
 Datum
@@ -4955,7 +5010,8 @@ circle_overabove(PG_FUNCTION_ARGS)
 }
 
 
-/*		circle_relop	-		is area(circle1) relop area(circle2), within
+/*
+ *		circle_relop	-		is area(circle1) relop area(circle2), within
  *								our accuracy constraint?
  */
 Datum
@@ -5017,7 +5073,8 @@ circle_ge(PG_FUNCTION_ARGS)
  *	"Arithmetic" operators on circles.
  *---------------------------------------------------------*/
 
-/* circle_add_pt()
+/*
+ * circle_add_pt()
  * Translation operator.
  */
 Datum
@@ -5051,7 +5108,8 @@ circle_sub_pt(PG_FUNCTION_ARGS)
 }
 
 
-/* circle_mul_pt()
+/*
+ * circle_mul_pt()
  * Rotation and scaling operators.
  */
 Datum
@@ -5085,7 +5143,8 @@ circle_div_pt(PG_FUNCTION_ARGS)
 }
 
 
-/*		circle_area		-		returns the area of the circle.
+/*
+ *		circle_area		-		returns the area of the circle.
  */
 Datum
 circle_area(PG_FUNCTION_ARGS)
@@ -5096,7 +5155,8 @@ circle_area(PG_FUNCTION_ARGS)
 }
 
 
-/*		circle_diameter -		returns the diameter of the circle.
+/*
+ *		circle_diameter -		returns the diameter of the circle.
  */
 Datum
 circle_diameter(PG_FUNCTION_ARGS)
@@ -5107,7 +5167,8 @@ circle_diameter(PG_FUNCTION_ARGS)
 }
 
 
-/*		circle_radius	-		returns the radius of the circle.
+/*
+ *		circle_radius	-		returns the radius of the circle.
  */
 Datum
 circle_radius(PG_FUNCTION_ARGS)
@@ -5118,7 +5179,8 @@ circle_radius(PG_FUNCTION_ARGS)
 }
 
 
-/*		circle_distance -		returns the distance between
+/*
+ *		circle_distance -		returns the distance between
  *								  two circles.
  */
 Datum
@@ -5161,7 +5223,8 @@ pt_contained_circle(PG_FUNCTION_ARGS)
 }
 
 
-/*		dist_pc -		returns the distance between
+/*
+ *		dist_pc -		returns the distance between
  *						  a point and a circle.
  */
 Datum
@@ -5196,7 +5259,8 @@ dist_cpoint(PG_FUNCTION_ARGS)
 	PG_RETURN_FLOAT8(result);
 }
 
-/*		circle_center	-		returns the center point of the circle.
+/*
+ *		circle_center	-		returns the center point of the circle.
  */
 Datum
 circle_center(PG_FUNCTION_ARGS)
@@ -5212,7 +5276,8 @@ circle_center(PG_FUNCTION_ARGS)
 }
 
 
-/*		circle_ar		-		returns the area of the circle.
+/*
+ *		circle_ar		-		returns the area of the circle.
  */
 static float8
 circle_ar(CIRCLE *circle)
@@ -5276,7 +5341,8 @@ fail:
 	PG_RETURN_NULL();
 }
 
-/* box_circle()
+/*
+ * box_circle()
  * Convert a box to a circle.
  */
 Datum
@@ -5536,7 +5602,8 @@ point_inside(Point *p, int npts, Point *plist)
 }
 
 
-/* lseg_crossing()
+/*
+ * lseg_crossing()
  * Returns +/-2 if line segment crosses the positive X-axis in a +/- direction.
  * Returns +/-1 if one point is on the positive X-axis.
  * Returns 0 if both points are on the positive X-axis, or there is no crossing.
diff --git a/src/backend/utils/adt/int.c b/src/backend/utils/adt/int.c
index 4c894a49d5d..01608d8ca42 100644
--- a/src/backend/utils/adt/int.c
+++ b/src/backend/utils/adt/int.c
@@ -1213,7 +1213,8 @@ int2mod(PG_FUNCTION_ARGS)
 }
 
 
-/* int[24]abs()
+/*
+ * int[24]abs()
  * Absolute value
  */
 Datum
diff --git a/src/backend/utils/adt/int8.c b/src/backend/utils/adt/int8.c
index 19bb30f2d0f..9b429da86d9 100644
--- a/src/backend/utils/adt/int8.c
+++ b/src/backend/utils/adt/int8.c
@@ -44,7 +44,8 @@ typedef struct
  * Formatting and conversion routines.
  *---------------------------------------------------------*/
 
-/* int8in()
+/*
+ * int8in()
  */
 Datum
 int8in(PG_FUNCTION_ARGS)
@@ -55,7 +56,8 @@ int8in(PG_FUNCTION_ARGS)
 }
 
 
-/* int8out()
+/*
+ * int8out()
  */
 Datum
 int8out(PG_FUNCTION_ARGS)
@@ -106,7 +108,8 @@ int8send(PG_FUNCTION_ARGS)
  *	Relational operators for int8s, including cross-data-type comparisons.
  *---------------------------------------------------------*/
 
-/* int8relop()
+/*
+ * int8relop()
  * Is val1 relop val2?
  */
 Datum
@@ -163,7 +166,8 @@ int8ge(PG_FUNCTION_ARGS)
 	PG_RETURN_BOOL(val1 >= val2);
 }
 
-/* int84relop()
+/*
+ * int84relop()
  * Is 64-bit val1 relop 32-bit val2?
  */
 Datum
@@ -220,7 +224,8 @@ int84ge(PG_FUNCTION_ARGS)
 	PG_RETURN_BOOL(val1 >= val2);
 }
 
-/* int48relop()
+/*
+ * int48relop()
  * Is 32-bit val1 relop 64-bit val2?
  */
 Datum
@@ -277,7 +282,8 @@ int48ge(PG_FUNCTION_ARGS)
 	PG_RETURN_BOOL(val1 >= val2);
 }
 
-/* int82relop()
+/*
+ * int82relop()
  * Is 64-bit val1 relop 16-bit val2?
  */
 Datum
@@ -334,7 +340,8 @@ int82ge(PG_FUNCTION_ARGS)
 	PG_RETURN_BOOL(val1 >= val2);
 }
 
-/* int28relop()
+/*
+ * int28relop()
  * Is 16-bit val1 relop 64-bit val2?
  */
 Datum
@@ -539,7 +546,8 @@ int8div(PG_FUNCTION_ARGS)
 	PG_RETURN_INT64(result);
 }
 
-/* int8abs()
+/*
+ * int8abs()
  * Absolute value
  */
 Datum
@@ -556,7 +564,8 @@ int8abs(PG_FUNCTION_ARGS)
 	PG_RETURN_INT64(result);
 }
 
-/* int8mod()
+/*
+ * int8mod()
  * Modulo operation.
  */
 Datum
@@ -1170,7 +1179,8 @@ int28div(PG_FUNCTION_ARGS)
 	PG_RETURN_INT64((int64) arg1 / arg2);
 }
 
-/* Binary arithmetics
+/*
+ * Binary arithmetics
  *
  *		int8and		- returns arg1 & arg2
  *		int8or		- returns arg1 | arg2
@@ -1290,7 +1300,8 @@ i8tod(PG_FUNCTION_ARGS)
 	PG_RETURN_FLOAT8(result);
 }
 
-/* dtoi8()
+/*
+ * dtoi8()
  * Convert float8 to 8-byte integer.
  */
 Datum
@@ -1325,7 +1336,8 @@ i8tof(PG_FUNCTION_ARGS)
 	PG_RETURN_FLOAT4(result);
 }
 
-/* ftoi8()
+/*
+ * ftoi8()
  * Convert float4 to 8-byte integer.
  */
 Datum
diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c
index f2b58ebfe1e..b9449b4574a 100644
--- a/src/backend/utils/adt/selfuncs.c
+++ b/src/backend/utils/adt/selfuncs.c
@@ -5970,7 +5970,7 @@ examine_variable(PlannerInfo *root, Node *node, int varRelid,
 /*
  * strip_all_phvs_deep
  *		Deeply strip all PlaceHolderVars in an expression.
-
+ *
  * As a performance optimization, we first use a lightweight walker to check
  * for the presence of any PlaceHolderVars.  The expensive mutator is invoked
  * only if a PlaceHolderVar is found, avoiding unnecessary memory allocation
diff --git a/src/backend/utils/adt/timestamp.c b/src/backend/utils/adt/timestamp.c
index 288d696be77..abc20755609 100644
--- a/src/backend/utils/adt/timestamp.c
+++ b/src/backend/utils/adt/timestamp.c
@@ -150,7 +150,8 @@ anytimestamp_typmodout(bool istz, int32 typmod)
  *	 USER I/O ROUTINES														 *
  *****************************************************************************/
 
-/* timestamp_in()
+/*
+ * timestamp_in()
  * Convert a string to internal form.
  */
 Datum
@@ -218,7 +219,8 @@ timestamp_in(PG_FUNCTION_ARGS)
 	PG_RETURN_TIMESTAMP(result);
 }
 
-/* timestamp_out()
+/*
+ * timestamp_out()
  * Convert a timestamp to external form.
  */
 Datum
@@ -330,7 +332,8 @@ timestamp_support(PG_FUNCTION_ARGS)
 	PG_RETURN_POINTER(ret);
 }
 
-/* timestamp_scale()
+/*
+ * timestamp_scale()
  * Adjust time type for specified scale factor.
  * Used by PostgreSQL type system to stuff columns.
  */
@@ -403,7 +406,8 @@ AdjustTimestampForTypmod(Timestamp *time, int32 typmod, Node *escontext)
 	return true;
 }
 
-/* timestamptz_in()
+/*
+ * timestamptz_in()
  * Convert a string to internal form.
  */
 Datum
@@ -761,7 +765,8 @@ float8_timestamptz(PG_FUNCTION_ARGS)
 	PG_RETURN_TIMESTAMP(result);
 }
 
-/* timestamptz_out()
+/*
+ * timestamptz_out()
  * Convert a timestamp to external form.
  */
 Datum
@@ -854,7 +859,8 @@ timestamptztypmodout(PG_FUNCTION_ARGS)
 }
 
 
-/* timestamptz_scale()
+/*
+ * timestamptz_scale()
  * Adjust time type for specified scale factor.
  * Used by PostgreSQL type system to stuff columns.
  */
@@ -874,7 +880,8 @@ timestamptz_scale(PG_FUNCTION_ARGS)
 }
 
 
-/* interval_in()
+/*
+ * interval_in()
  * Convert a string to internal form.
  *
  * External format(s):
@@ -959,7 +966,8 @@ interval_in(PG_FUNCTION_ARGS)
 	PG_RETURN_INTERVAL_P(result);
 }
 
-/* interval_out()
+/*
+ * interval_out()
  * Convert a time span to external form.
  */
 Datum
@@ -1313,7 +1321,8 @@ interval_support(PG_FUNCTION_ARGS)
 	PG_RETURN_POINTER(ret);
 }
 
-/* interval_scale()
+/*
+ * interval_scale()
  * Adjust interval type for specified fields.
  * Used by PostgreSQL type system to stuff columns.
  */
@@ -1574,7 +1583,8 @@ out_of_range:
 	PG_RETURN_NULL();			/* keep compiler quiet */
 }
 
-/* EncodeSpecialTimestamp()
+/*
+ * EncodeSpecialTimestamp()
  * Convert reserved timestamp data type to string.
  */
 void
@@ -1989,7 +1999,8 @@ timestamp2tm(Timestamp dt, int *tzp, struct pg_tm *tm, fsec_t *fsec, const char
 }
 
 
-/* tm2timestamp()
+/*
+ * tm2timestamp()
  * Convert a tm structure to a timestamp data type.
  * Note that year is _not_ 1900-based, but is an explicit full value.
  * Also, month is one-based, _not_ zero-based.
@@ -2032,7 +2043,8 @@ tm2timestamp(struct pg_tm *tm, fsec_t fsec, int *tzp, Timestamp *result)
 }
 
 
-/* interval2itm()
+/*
+ * interval2itm()
  * Convert an Interval to a pg_itm structure.
  * Note: overflow is not possible, because the pg_itm fields are
  * wide enough for all possible conversion results.
@@ -2060,7 +2072,8 @@ interval2itm(Interval span, struct pg_itm *itm)
 	itm->tm_usec = (int) time;
 }
 
-/* itm2interval()
+/*
+ * itm2interval()
  * Convert a pg_itm structure to an Interval.
  * Returns 0 if OK, -1 on overflow.
  *
@@ -2094,7 +2107,8 @@ itm2interval(struct pg_itm *itm, Interval *span)
 	return 0;
 }
 
-/* itmin2interval()
+/*
+ * itmin2interval()
  * Convert a pg_itm_in structure to an Interval.
  * Returns 0 if OK, -1 on overflow.
  *
@@ -2656,7 +2670,8 @@ interval_hash_extended(PG_FUNCTION_ARGS)
 							   PG_GETARG_DATUM(1));
 }
 
-/* overlaps_timestamp() --- implements the SQL OVERLAPS operator.
+/*
+ * overlaps_timestamp() --- implements the SQL OVERLAPS operator.
  *
  * Algorithm is per SQL spec.  This is much harder than you'd think
  * because the spec requires us to deliver a non-null answer in some cases
@@ -3070,7 +3085,8 @@ interval_justify_days(PG_FUNCTION_ARGS)
 	PG_RETURN_INTERVAL_P(result);
 }
 
-/* timestamp_pl_interval()
+/*
+ * timestamp_pl_interval()
  * Add an interval to a timestamp data type.
  * Note that interval has provisions for qualitative year/month and day
  *	units, so try to do the right thing with them.
@@ -3212,7 +3228,8 @@ timestamp_mi_interval(PG_FUNCTION_ARGS)
 }
 
 
-/* timestamptz_pl_interval_internal()
+/*
+ * timestamptz_pl_interval_internal()
  * Add an interval to a timestamptz, in the given (or session) timezone.
  *
  * Note that interval has provisions for qualitative year/month and day
@@ -3352,7 +3369,8 @@ timestamptz_pl_interval_internal(TimestampTz timestamp,
 	return result;
 }
 
-/* timestamptz_mi_interval_internal()
+/*
+ * timestamptz_mi_interval_internal()
  * As above, but subtract the interval.
  */
 static TimestampTz
@@ -3367,7 +3385,8 @@ timestamptz_mi_interval_internal(TimestampTz timestamp,
 	return timestamptz_pl_interval_internal(timestamp, &tspan, attimezone);
 }
 
-/* timestamptz_pl_interval()
+/*
+ * timestamptz_pl_interval()
  * Add an interval to a timestamptz, in the session timezone.
  */
 Datum
@@ -3388,7 +3407,8 @@ timestamptz_mi_interval(PG_FUNCTION_ARGS)
 	PG_RETURN_TIMESTAMP(timestamptz_mi_interval_internal(timestamp, span, NULL));
 }
 
-/* timestamptz_pl_interval_at_zone()
+/*
+ * timestamptz_pl_interval_at_zone()
  * Add an interval to a timestamptz, in the specified timezone.
  */
 Datum
@@ -3413,7 +3433,8 @@ timestamptz_mi_interval_at_zone(PG_FUNCTION_ARGS)
 	PG_RETURN_TIMESTAMP(timestamptz_mi_interval_internal(timestamp, span, attimezone));
 }
 
-/* interval_um_internal()
+/*
+ * interval_um_internal()
  * Negate an interval.
  */
 static void
@@ -4272,7 +4293,8 @@ interval_sum(PG_FUNCTION_ARGS)
 	PG_RETURN_INTERVAL_P(result);
 }
 
-/* timestamp_age()
+/*
+ * timestamp_age()
  * Calculate time difference while retaining year/month fields.
  * Note that this does not result in an accurate absolute time span
  *	since year and month are out of context once the arithmetic
@@ -4418,7 +4440,8 @@ timestamp_age(PG_FUNCTION_ARGS)
 }
 
 
-/* timestamptz_age()
+/*
+ * timestamptz_age()
  * Calculate time difference while retaining year/month fields.
  * Note that this does not result in an accurate absolute time span
  *	since year and month are out of context once the arithmetic
@@ -4575,7 +4598,8 @@ timestamptz_age(PG_FUNCTION_ARGS)
  *---------------------------------------------------------*/
 
 
-/* timestamp_bin()
+/*
+ * timestamp_bin()
  * Bin timestamp into specified interval.
  */
 Datum
@@ -4646,7 +4670,8 @@ timestamp_bin(PG_FUNCTION_ARGS)
 	PG_RETURN_TIMESTAMP(result);
 }
 
-/* timestamp_trunc()
+/*
+ * timestamp_trunc()
  * Truncate timestamp to specified units.
  */
 Datum
@@ -4810,7 +4835,8 @@ timestamp_trunc(PG_FUNCTION_ARGS)
 	PG_RETURN_TIMESTAMP(result);
 }
 
-/* timestamptz_bin()
+/*
+ * timestamptz_bin()
  * Bin timestamptz into specified interval using specified origin.
  */
 Datum
@@ -5062,7 +5088,8 @@ timestamptz_trunc_internal(text *units, TimestampTz timestamp, pg_tz *tzp)
 	return result;
 }
 
-/* timestamptz_trunc()
+/*
+ * timestamptz_trunc()
  * Truncate timestamptz to specified units in session timezone.
  */
 Datum
@@ -5077,7 +5104,8 @@ timestamptz_trunc(PG_FUNCTION_ARGS)
 	PG_RETURN_TIMESTAMPTZ(result);
 }
 
-/* timestamptz_trunc_zone()
+/*
+ * timestamptz_trunc_zone()
  * Truncate timestamptz to specified units in specified timezone.
  */
 Datum
@@ -5099,7 +5127,8 @@ timestamptz_trunc_zone(PG_FUNCTION_ARGS)
 	PG_RETURN_TIMESTAMPTZ(result);
 }
 
-/* interval_trunc()
+/*
+ * interval_trunc()
  * Extract specified field from interval.
  */
 Datum
@@ -5225,7 +5254,8 @@ interval_trunc(PG_FUNCTION_ARGS)
 	PG_RETURN_INTERVAL_P(result);
 }
 
-/* isoweek2j()
+/*
+ * isoweek2j()
  *
  *	Return the Julian day which corresponds to the first day (Monday) of the given ISO 8601 year and week.
  *	Julian days are used to convert between ISO week dates and Gregorian dates.
@@ -5249,7 +5279,8 @@ isoweek2j(int year, int week)
 	return ((week - 1) * 7) + (day4 - day0);
 }
 
-/* isoweek2date()
+/*
+ * isoweek2date()
  * Convert ISO week of year number to date.
  * The year field must be specified with the ISO year!
  * karel 2000/08/07
@@ -5260,7 +5291,8 @@ isoweek2date(int woy, int *year, int *mon, int *mday)
 	j2date(isoweek2j(*year, woy), year, mon, mday);
 }
 
-/* isoweekdate2date()
+/*
+ * isoweekdate2date()
  *
  *	Convert an ISO 8601 week date (ISO year, ISO week) into a Gregorian date.
  *	Gregorian day of week sent so weekday strings can be supplied.
@@ -5281,7 +5313,8 @@ isoweekdate2date(int isoweek, int wday, int *year, int *mon, int *mday)
 	j2date(jday, year, mon, mday);
 }
 
-/* date2isoweek()
+/*
+ * date2isoweek()
  *
  *	Returns ISO week number of year.
  */
@@ -5335,7 +5368,8 @@ date2isoweek(int year, int mon, int mday)
 }
 
 
-/* date2isoyear()
+/*
+ * date2isoyear()
  *
  *	Returns ISO 8601 year number.
  *	Note: zero or negative results follow the year-zero-exists convention.
@@ -5392,7 +5426,8 @@ date2isoyear(int year, int mon, int mday)
 }
 
 
-/* date2isoyearday()
+/*
+ * date2isoyearday()
  *
  *	Returns the ISO 8601 day-of-year, given a Gregorian year, month and day.
  *	Possible return values are 1 through 371 (364 in non-leap years).
@@ -5468,7 +5503,8 @@ NonFiniteTimestampTzPart(int type, int unit, char *lowunits,
 	}
 }
 
-/* timestamp_part() and extract_timestamp()
+/*
+ * timestamp_part() and extract_timestamp()
  * Extract specified field from timestamp.
  */
 static Datum
@@ -5741,7 +5777,8 @@ extract_timestamp(PG_FUNCTION_ARGS)
 	return timestamp_part_common(fcinfo, true);
 }
 
-/* timestamptz_part() and extract_timestamptz()
+/*
+ * timestamptz_part() and extract_timestamptz()
  * Extract specified field from timestamp with time zone.
  */
 static Datum
@@ -6067,7 +6104,8 @@ NonFiniteIntervalPart(int type, int unit, char *lowunits, bool isNegative)
 	}
 }
 
-/* interval_part() and extract_interval()
+/*
+ * interval_part() and extract_interval()
  * Extract specified field from interval.
  */
 static Datum
@@ -6290,7 +6328,8 @@ extract_interval(PG_FUNCTION_ARGS)
 }
 
 
-/*	timestamp_zone()
+/*
+ *	timestamp_zone()
  *	Encode timestamp type with specified time zone.
  *	This function is just timestamp2timestamptz() except instead of
  *	shifting to the global timezone, we shift to the specified timezone.
@@ -6360,7 +6399,8 @@ timestamp_zone(PG_FUNCTION_ARGS)
 	PG_RETURN_TIMESTAMPTZ(result);
 }
 
-/* timestamp_izone()
+/*
+ * timestamp_izone()
  * Encode timestamp type with specified time interval as time zone.
  */
 Datum
@@ -6400,7 +6440,8 @@ timestamp_izone(PG_FUNCTION_ARGS)
 	PG_RETURN_TIMESTAMPTZ(result);
 }								/* timestamp_izone() */
 
-/* TimestampTimestampTzRequiresRewrite()
+/*
+ * TimestampTimestampTzRequiresRewrite()
  *
  * Returns false if the TimeZone GUC setting causes timestamp_timestamptz and
  * timestamptz_timestamp to be no-ops, where the return value has the same
@@ -6417,7 +6458,8 @@ TimestampTimestampTzRequiresRewrite(void)
 	return true;
 }
 
-/* timestamp_timestamptz()
+/*
+ * timestamp_timestamptz()
  * Convert local timestamp to timestamp at GMT
  */
 Datum
@@ -6485,7 +6527,8 @@ timestamp2timestamptz(Timestamp timestamp)
 	return timestamp2timestamptz_safe(timestamp, NULL);
 }
 
-/* timestamptz_timestamp()
+/*
+ * timestamptz_timestamp()
  * Convert timestamp at GMT to local timestamp
  */
 Datum
@@ -6559,7 +6602,8 @@ timestamptz2timestamp_safe(TimestampTz timestamp, Node *escontext)
 	return result;
 }
 
-/* timestamptz_zone()
+/*
+ * timestamptz_zone()
  * Evaluate timestamp with time zone type at the specified time zone.
  * Returns a timestamp without time zone.
  */
@@ -6623,7 +6667,8 @@ timestamptz_zone(PG_FUNCTION_ARGS)
 	PG_RETURN_TIMESTAMP(result);
 }
 
-/* timestamptz_izone()
+/*
+ * timestamptz_izone()
  * Encode timestamp with time zone type with specified time interval as time zone.
  * Returns a timestamp without time zone.
  */
@@ -6664,7 +6709,8 @@ timestamptz_izone(PG_FUNCTION_ARGS)
 	PG_RETURN_TIMESTAMP(result);
 }
 
-/* generate_series_timestamp()
+/*
+ * generate_series_timestamp()
  * Generate the set of timestamps from start to finish by step
  */
 Datum
@@ -6746,7 +6792,8 @@ generate_series_timestamp(PG_FUNCTION_ARGS)
 	}
 }
 
-/* generate_series_timestamptz()
+/*
+ * generate_series_timestamptz()
  * Generate the set of timestamps from start to finish by step,
  * doing arithmetic in the specified or session timezone.
  */
@@ -6930,7 +6977,8 @@ generate_series_timestamp_support(PG_FUNCTION_ARGS)
 }
 
 
-/* timestamp_at_local()
+/*
+ * timestamp_at_local()
  * timestamptz_at_local()
  *
  * The regression tests do not like two functions with the same proargs and
diff --git a/src/backend/utils/adt/varchar.c b/src/backend/utils/adt/varchar.c
index a62e55eec19..45b7ef185a1 100644
--- a/src/backend/utils/adt/varchar.c
+++ b/src/backend/utils/adt/varchar.c
@@ -346,7 +346,8 @@ bpchar(PG_FUNCTION_ARGS)
 }
 
 
-/* char_bpchar()
+/*
+ * char_bpchar()
  * Convert char to bpchar(1).
  */
 Datum
@@ -364,7 +365,8 @@ char_bpchar(PG_FUNCTION_ARGS)
 }
 
 
-/* bpchar_name()
+/*
+ * bpchar_name()
  * Converts a bpchar() type to a NameData type.
  */
 Datum
@@ -397,7 +399,8 @@ bpchar_name(PG_FUNCTION_ARGS)
 	PG_RETURN_NAME(result);
 }
 
-/* name_bpchar()
+/*
+ * name_bpchar()
  * Converts a NameData type to a bpchar type.
  *
  * Uses the text conversion functions, which is only appropriate if BpChar
diff --git a/src/backend/utils/adt/varlena.c b/src/backend/utils/adt/varlena.c
index c0ff51bd2fc..695de25582a 100644
--- a/src/backend/utils/adt/varlena.c
+++ b/src/backend/utils/adt/varlena.c
@@ -1395,7 +1395,8 @@ varstr_cmp(const char *arg1, int len1, const char *arg2, int len2, Oid collid)
 	return result;
 }
 
-/* text_cmp()
+/*
+ * text_cmp()
  * Internal comparison function for text strings.
  * Returns -1, 0 or 1
  */
@@ -2672,7 +2673,8 @@ bttext_pattern_sortsupport(PG_FUNCTION_ARGS)
 }
 
 
-/* text_name()
+/*
+ * text_name()
  * Converts a text type to a Name type.
  */
 Datum
@@ -2695,7 +2697,8 @@ text_name(PG_FUNCTION_ARGS)
 	PG_RETURN_NAME(result);
 }
 
-/* name_text()
+/*
+ * name_text()
  * Converts a Name type to a text type.
  */
 Datum
diff --git a/src/backend/utils/mb/mbutils.c b/src/backend/utils/mb/mbutils.c
index bfbe0d28075..e4f29c2b1c9 100644
--- a/src/backend/utils/mb/mbutils.c
+++ b/src/backend/utils/mb/mbutils.c
@@ -1178,7 +1178,8 @@ pg_mbstrlen(const char *mbstr)
 	return len;
 }
 
-/* returns the length (counted in wchars) of a multibyte string
+/*
+ * returns the length (counted in wchars) of a multibyte string
  * (stops at the first of "limit" or a NUL)
  */
 int
diff --git a/src/bin/pg_dump/common.c b/src/bin/pg_dump/common.c
index d1431c5c24c..dc98c5c5c09 100644
--- a/src/bin/pg_dump/common.c
+++ b/src/bin/pg_dump/common.c
@@ -253,7 +253,8 @@ getSchemaData(Archive *fout, int *numTablesPtr)
 	return tblinfo;
 }
 
-/* flagInhTables -
+/*
+ * flagInhTables -
  *	 Fill in parent link fields of tables for which we need that information,
  *	 mark parents of target tables as interesting, and create
  *	 TableAttachInfo objects for partitioned tables with appropriate
@@ -448,7 +449,8 @@ flagInhIndexes(Archive *fout, TableInfo tblinfo[], int numTables)
 	}
 }
 
-/* flagInhAttrs -
+/*
+ * flagInhAttrs -
  *	 for each dumpable table in tblinfo, flag its inherited attributes
  *
  * What we need to do here is:
diff --git a/src/bin/psql/common.c b/src/bin/psql/common.c
index 476e7fe6737..1a4e2ea0da8 100644
--- a/src/bin/psql/common.c
+++ b/src/bin/psql/common.c
@@ -328,7 +328,8 @@ psql_setup_cancel_handler(void)
 }
 
 
-/* ConnectionUp
+/*
+ * ConnectionUp
  *
  * Returns whether our backend connection is still there.
  */
@@ -340,7 +341,8 @@ ConnectionUp(void)
 
 
 
-/* CheckConnection
+/*
+ * CheckConnection
  *
  * Verify that we still have a good connection to the backend, and if not,
  * see if it can be restored.
@@ -2567,7 +2569,8 @@ get_conninfo_value(const char *keyword)
 	return res;
 }
 
-/* expand_tilde
+/*
+ * expand_tilde
  *
  * substitute '~' with HOME or '~username' with username's home dir
  *
diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c
index 69d044d405d..7665f0a3124 100644
--- a/src/bin/psql/startup.c
+++ b/src/bin/psql/startup.c
@@ -840,7 +840,8 @@ process_psqlrc_file(char *filename)
 
 
 
-/* showVersion
+/*
+ * showVersion
  *
  * This output format is intended to match GNU standards.
  */
diff --git a/src/bin/psql/tab-complete.in.c b/src/bin/psql/tab-complete.in.c
index db65d130fcb..cf4db32a588 100644
--- a/src/bin/psql/tab-complete.in.c
+++ b/src/bin/psql/tab-complete.in.c
@@ -211,7 +211,8 @@ typedef struct SchemaQuery
 } SchemaQuery;
 
 
-/* Store maximum number of records we want from database queries
+/*
+ * Store maximum number of records we want from database queries
  * (implemented via SELECT ... LIMIT xx).
  */
 static int	completion_max_records;
diff --git a/src/common/sha2.c b/src/common/sha2.c
index 275d796bb97..e94140300ae 100644
--- a/src/common/sha2.c
+++ b/src/common/sha2.c
@@ -152,7 +152,8 @@
 #define sigma1_512(x)	(S64(19, (x)) ^ S64(61, (x)) ^ R( 6,   (x)))
 
 /*** INTERNAL FUNCTION PROTOTYPES *************************************/
-/* NOTE: These should not be accessed directly from outside this
+/*
+ * NOTE: These should not be accessed directly from outside this
  * library -- they are intended for private internal visibility/use
  * only.
  */
diff --git a/src/common/wchar.c b/src/common/wchar.c
index 4c77e3e1dc8..926823cabec 100644
--- a/src/common/wchar.c
+++ b/src/common/wchar.c
@@ -618,7 +618,8 @@ mbbisearch(pg_wchar ucs, const struct mbinterval *table, int max)
 }
 
 
-/* The following functions define the column width of an ISO 10646
+/*
+ * The following functions define the column width of an ISO 10646
  * character as follows:
  *
  *	  - The null character (U+0000) has a column width of 0.
diff --git a/src/include/access/amapi.h b/src/include/access/amapi.h
index ecfbd017d66..79240333530 100644
--- a/src/include/access/amapi.h
+++ b/src/include/access/amapi.h
@@ -154,7 +154,8 @@ typedef void (*amcostestimate_function) (PlannerInfo *root,
 										 double *indexCorrelation,
 										 double *indexPages);
 
-/* estimate height of a tree-structured index
+/*
+ * estimate height of a tree-structured index
  *
  * XXX This just computes a value that is later used by amcostestimate.  This
  * API could be expanded to support passing more values if the need arises.
diff --git a/src/include/executor/tuptable.h b/src/include/executor/tuptable.h
index d7e8e72aeae..3db6c9c9bd0 100644
--- a/src/include/executor/tuptable.h
+++ b/src/include/executor/tuptable.h
@@ -480,7 +480,8 @@ ExecClearTuple(TupleTableSlot *slot)
 	return slot;
 }
 
-/* ExecMaterializeSlot - force a slot into the "materialized" state.
+/*
+ * ExecMaterializeSlot - force a slot into the "materialized" state.
  *
  * This causes the slot's tuple to be a local copy not dependent on any
  * external storage (i.e. pointing into a Buffer, or having allocations in
diff --git a/src/include/fmgr.h b/src/include/fmgr.h
index 10d02bdb79f..38e143ac670 100644
--- a/src/include/fmgr.h
+++ b/src/include/fmgr.h
@@ -554,7 +554,8 @@ extern int no_such_variable
  *-------------------------------------------------------------------------
  */
 
-/* These are for invocation of a specifically named function with a
+/*
+ * These are for invocation of a specifically named function with a
  * directly-computed parameter list.  Note that neither arguments nor result
  * are allowed to be NULL.  Also, the function cannot be one that needs to
  * look at FmgrInfo, since there won't be any.
@@ -603,7 +604,8 @@ extern Datum CallerFInfoFunctionCall1(PGFunction func, FmgrInfo *flinfo,
 extern Datum CallerFInfoFunctionCall2(PGFunction func, FmgrInfo *flinfo,
 									  Oid collation, Datum arg1, Datum arg2);
 
-/* These are for invocation of a previously-looked-up function with a
+/*
+ * These are for invocation of a previously-looked-up function with a
  * directly-computed parameter list.  Note that neither arguments nor result
  * are allowed to be NULL.
  */
@@ -639,7 +641,8 @@ extern Datum FunctionCall9Coll(FmgrInfo *flinfo, Oid collation,
 							   Datum arg6, Datum arg7, Datum arg8,
 							   Datum arg9);
 
-/* These are for invocation of a function identified by OID with a
+/*
+ * These are for invocation of a function identified by OID with a
  * directly-computed parameter list.  Note that neither arguments nor result
  * are allowed to be NULL.  These are essentially fmgr_info() followed by
  * FunctionCallN().  If the same function is to be invoked repeatedly, do the
@@ -677,7 +680,8 @@ extern Datum OidFunctionCall9Coll(Oid functionId, Oid collation,
 								  Datum arg6, Datum arg7, Datum arg8,
 								  Datum arg9);
 
-/* These macros allow the collation argument to be omitted (with a default of
+/*
+ * These macros allow the collation argument to be omitted (with a default of
  * InvalidOid, ie, no collation).  They exist mostly for backwards
  * compatibility of source code.
  */
diff --git a/src/include/tsearch/ts_type.h b/src/include/tsearch/ts_type.h
index 847f6d3497e..f0c68d0638a 100644
--- a/src/include/tsearch/ts_type.h
+++ b/src/include/tsearch/ts_type.h
@@ -228,7 +228,8 @@ typedef TSQueryData *TSQuery;
 
 #define HDRSIZETQ	( VARHDRSZ + sizeof(int32) )
 
-/* Computes the size of header and all QueryItems. size is the number of
+/*
+ * Computes the size of header and all QueryItems. size is the number of
  * QueryItems, and lenofoperand is the total length of all operands
  */
 #define COMPUTESIZE(size, lenofoperand) ( HDRSIZETQ + (size) * sizeof(QueryItem) + (lenofoperand) )
diff --git a/src/include/utils/datetime.h b/src/include/utils/datetime.h
index f77c6acd8b6..87c50eebf12 100644
--- a/src/include/utils/datetime.h
+++ b/src/include/utils/datetime.h
@@ -228,7 +228,8 @@ typedef struct DynamicZoneAbbrev
 } DynamicZoneAbbrev;
 
 
-/* FMODULO()
+/*
+ * FMODULO()
  * Macro to replace modf(), which is broken on some platforms.
  * t = input and remainder
  * q = integer part
@@ -240,7 +241,8 @@ do { \
 	if ((q) != 0) (t) -= rint((q) * (u)); \
 } while(0)
 
-/* TMODULO()
+/*
+ * TMODULO()
  * Like FMODULO(), but work on the timestamp datatype (now always int64).
  * We assume that int64 follows the C99 semantics for division (negative
  * quotients truncate towards zero).
diff --git a/src/include/utils/tuplestore.h b/src/include/utils/tuplestore.h
index f638b96e156..aaacd281874 100644
--- a/src/include/utils/tuplestore.h
+++ b/src/include/utils/tuplestore.h
@@ -34,7 +34,8 @@
 #include "executor/tuptable.h"
 
 
-/* Tuplestorestate is an opaque type whose details are not known outside
+/*
+ * Tuplestorestate is an opaque type whose details are not known outside
  * tuplestore.c.
  */
 typedef struct Tuplestorestate Tuplestorestate;
diff --git a/src/interfaces/ecpg/ecpglib/descriptor.c b/src/interfaces/ecpg/ecpglib/descriptor.c
index 1ad5f2d88cc..b3529f84b47 100644
--- a/src/interfaces/ecpg/ecpglib/descriptor.c
+++ b/src/interfaces/ecpg/ecpglib/descriptor.c
@@ -1,4 +1,5 @@
-/* dynamic SQL support routines
+/*
+ * dynamic SQL support routines
  *
  * src/interfaces/ecpg/ecpglib/descriptor.c
  */
diff --git a/src/interfaces/ecpg/include/ecpgerrno.h b/src/interfaces/ecpg/include/ecpgerrno.h
index c4bc526463d..b5b0c087b59 100644
--- a/src/interfaces/ecpg/include/ecpgerrno.h
+++ b/src/interfaces/ecpg/include/ecpgerrno.h
@@ -9,7 +9,8 @@
 #define ECPG_NO_ERROR		0
 #define ECPG_NOT_FOUND		100
 
-/* system error codes returned by ecpglib get the correct number,
+/*
+ * system error codes returned by ecpglib get the correct number,
  * but are made negative
  */
 #define ECPG_OUT_OF_MEMORY	-ENOMEM
diff --git a/src/interfaces/ecpg/pgtypeslib/dt.h b/src/interfaces/ecpg/pgtypeslib/dt.h
index 00a45799d55..83e6cad167d 100644
--- a/src/interfaces/ecpg/pgtypeslib/dt.h
+++ b/src/interfaces/ecpg/pgtypeslib/dt.h
@@ -208,7 +208,8 @@ typedef struct
 } datetkn;
 
 
-/* FMODULO()
+/*
+ * FMODULO()
  * Macro to replace modf(), which is broken on some platforms.
  * t = input and remainder
  * q = integer part
@@ -220,7 +221,8 @@ do { \
 	if ((q) != 0) (t) -= rint((q) * (u)); \
 } while(0)
 
-/* TMODULO()
+/*
+ * TMODULO()
  * Like FMODULO(), but work on the timestamp datatype (now always int64).
  * We assume that int64 follows the C99 semantics for division (negative
  * quotients truncate towards zero).
diff --git a/src/interfaces/ecpg/pgtypeslib/dt_common.c b/src/interfaces/ecpg/pgtypeslib/dt_common.c
index c4119ab7932..cf137b42139 100644
--- a/src/interfaces/ecpg/pgtypeslib/dt_common.c
+++ b/src/interfaces/ecpg/pgtypeslib/dt_common.c
@@ -528,7 +528,8 @@ datebsearch(const char *key, const datetkn *base, unsigned int nel)
 	return NULL;
 }
 
-/* DecodeUnits()
+/*
+ * DecodeUnits()
  * Decode text string using lookup table.
  * This routine supports time interval decoding.
  */
@@ -626,7 +627,8 @@ j2date(int jd, int *year, int *month, int *day)
 	*month = (quad + 10) % 12 + 1;
 }								/* j2date() */
 
-/* DecodeSpecial()
+/*
+ * DecodeSpecial()
  * Decode text string using lookup table.
  * Implement a cache lookup since it is likely that dates
  *	will be related in format.
@@ -662,7 +664,8 @@ DecodeSpecial(int field, char *lowtoken, int *val)
 	return type;
 }								/* DecodeSpecial() */
 
-/* EncodeDateOnly()
+/*
+ * EncodeDateOnly()
  * Encode date as local time.
  */
 void
@@ -731,7 +734,8 @@ TrimTrailingZeros(char *str)
 	}
 }
 
-/* EncodeDateTime()
+/*
+ * EncodeDateTime()
  * Encode date and time interpreted as local time.
  *
  * tm and fsec are the value to encode, print_tz determines whether to include
@@ -1080,7 +1084,8 @@ dt2time(double jd, int *hour, int *min, int *sec, fsec_t *fsec)
 
 
 
-/* DecodeNumberField()
+/*
+ * DecodeNumberField()
  * Interpret numeric string as a concatenated date or time field.
  * Use the context of previously decoded fields to help with
  * the interpretation.
@@ -1192,7 +1197,8 @@ DecodeNumberField(int len, char *str, int fmask,
 }								/* DecodeNumberField() */
 
 
-/* DecodeNumber()
+/*
+ * DecodeNumber()
  * Interpret plain numeric field as a date value in context.
  */
 static int
@@ -1300,7 +1306,8 @@ DecodeNumber(int flen, char *str, int fmask,
 	return 0;
 }								/* DecodeNumber() */
 
-/* DecodeDate()
+/*
+ * DecodeDate()
  * Decode date string which includes delimiters.
  * Insist on a complete set of fields.
  */
@@ -1428,7 +1435,8 @@ DecodeDate(char *str, int fmask, int *tmask, struct tm *tm, bool EuroDates)
 }								/* DecodeDate() */
 
 
-/* DecodeTime()
+/*
+ * DecodeTime()
  * Decode time string which includes delimiters.
  * Only check the lower limit on hours, since this same code
  *	can be used to represent time spans.
@@ -1492,7 +1500,8 @@ DecodeTime(char *str, int *tmask, struct tm *tm, fsec_t *fsec)
 	return 0;
 }								/* DecodeTime() */
 
-/* DecodeTimezone()
+/*
+ * DecodeTimezone()
  * Interpret string as a numeric timezone.
  *
  * Note: we allow timezone offsets up to 13:59.  There are places that
@@ -1537,7 +1546,8 @@ DecodeTimezone(char *str, int *tzp)
 }								/* DecodeTimezone() */
 
 
-/* DecodePosixTimezone()
+/*
+ * DecodePosixTimezone()
  * Interpret string as a POSIX-compatible timezone:
  *	PST-hh:mm
  *	PST+h
@@ -1578,7 +1588,8 @@ DecodePosixTimezone(char *str, int *tzp)
 	return 0;
 }								/* DecodePosixTimezone() */
 
-/* ParseDateTime()
+/*
+ * ParseDateTime()
  * Break string into tokens based on a date/time context.
  * Several field types are assigned:
  *	DTK_NUMBER - digits and (possibly) a decimal point
@@ -1758,7 +1769,8 @@ ParseDateTime(char *timestr, char *lowstr,
 }								/* ParseDateTime() */
 
 
-/* DecodeDateTime()
+/*
+ * DecodeDateTime()
  * Interpret previously parsed fields for general date and time.
  * Return 0 if full date, 1 if only time, and -1 if problems.
  *		External format(s):
diff --git a/src/interfaces/ecpg/pgtypeslib/interval.c b/src/interfaces/ecpg/pgtypeslib/interval.c
index 463455398f1..a61d66ab2c9 100644
--- a/src/interfaces/ecpg/pgtypeslib/interval.c
+++ b/src/interfaces/ecpg/pgtypeslib/interval.c
@@ -12,7 +12,8 @@
 #include "pgtypes_interval.h"
 #include "pgtypeslib_extern.h"
 
-/* copy&pasted from .../src/backend/utils/adt/datetime.c
+/*
+ * copy&pasted from .../src/backend/utils/adt/datetime.c
  * and changed struct pg_tm to struct tm
  */
 static void
@@ -30,7 +31,8 @@ AdjustFractSeconds(double frac, struct /* pg_ */ tm *tm, fsec_t *fsec, int scale
 }
 
 
-/* copy&pasted from .../src/backend/utils/adt/datetime.c
+/*
+ * copy&pasted from .../src/backend/utils/adt/datetime.c
  * and changed struct pg_tm to struct tm
  */
 static void
@@ -83,7 +85,8 @@ ISO8601IntegerWidth(const char *fieldstart)
 }
 
 
-/* copy&pasted from .../src/backend/utils/adt/datetime.c
+/*
+ * copy&pasted from .../src/backend/utils/adt/datetime.c
  * and changed struct pg_tm to struct tm
  */
 static inline void
@@ -98,7 +101,8 @@ ClearPgTm(struct /* pg_ */ tm *tm, fsec_t *fsec)
 	*fsec = 0;
 }
 
-/* copy&pasted from .../src/backend/utils/adt/datetime.c
+/*
+ * copy&pasted from .../src/backend/utils/adt/datetime.c
  *
  * * changed struct pg_tm to struct tm
  *
@@ -304,7 +308,8 @@ DecodeISO8601Interval(char *str,
 
 
 
-/* copy&pasted from .../src/backend/utils/adt/datetime.c
+/*
+ * copy&pasted from .../src/backend/utils/adt/datetime.c
  * with 3 exceptions
  *
  *	* changed struct pg_tm to struct tm
@@ -746,7 +751,8 @@ AppendSeconds(char *cp, int sec, fsec_t fsec, int precision, bool fillzeros)
 }
 
 
-/* copy&pasted from .../src/backend/utils/adt/datetime.c
+/*
+ * copy&pasted from .../src/backend/utils/adt/datetime.c
  *
  * Change pg_tm to tm
  */
@@ -931,7 +937,8 @@ EncodeInterval(struct /* pg_ */ tm *tm, fsec_t fsec, int style, char *str)
 }
 
 
-/* interval2tm()
+/*
+ * interval2tm()
  * Convert an interval data type to a tm structure.
  */
 static int
diff --git a/src/interfaces/ecpg/pgtypeslib/timestamp.c b/src/interfaces/ecpg/pgtypeslib/timestamp.c
index 9bf1b914553..bc929c0c705 100644
--- a/src/interfaces/ecpg/pgtypeslib/timestamp.c
+++ b/src/interfaces/ecpg/pgtypeslib/timestamp.c
@@ -26,7 +26,8 @@ dt2local(timestamp dt, int tz)
 	return dt;
 }								/* dt2local() */
 
-/* tm2timestamp()
+/*
+ * tm2timestamp()
  * Convert a tm structure to a timestamp data type.
  * Note that year is _not_ 1900-based, but is an explicit full value.
  * Also, month is one-based, _not_ zero-based.
@@ -73,7 +74,8 @@ SetEpochTimestamp(void)
 	return dt;
 }								/* SetEpochTimestamp() */
 
-/* timestamp2tm()
+/*
+ * timestamp2tm()
  * Convert timestamp data type to POSIX time structure.
  * Note that year is _not_ 1900-based, but is an explicit full value.
  * Also, month is one-based, _not_ zero-based.
diff --git a/src/interfaces/libpq/fe-exec.c b/src/interfaces/libpq/fe-exec.c
index 203d388bdbf..324b62e0b93 100644
--- a/src/interfaces/libpq/fe-exec.c
+++ b/src/interfaces/libpq/fe-exec.c
@@ -3897,7 +3897,8 @@ PQgetvalue(const PGresult *res, int tup_num, int field_num)
 	return res->tuples[tup_num][field_num].value;
 }
 
-/* PQgetlength:
+/*
+ * PQgetlength:
  *	returns the actual length of a field value in bytes.
  */
 int
@@ -3911,7 +3912,8 @@ PQgetlength(const PGresult *res, int tup_num, int field_num)
 		return 0;
 }
 
-/* PQgetisnull:
+/*
+ * PQgetisnull:
  *	returns the null status of a field value.
  */
 int
@@ -3925,7 +3927,8 @@ PQgetisnull(const PGresult *res, int tup_num, int field_num)
 		return 0;
 }
 
-/* PQnparams:
+/*
+ * PQnparams:
  *	returns the number of input parameters of a prepared statement.
  */
 int
@@ -3936,7 +3939,8 @@ PQnparams(const PGresult *res)
 	return res->numParameters;
 }
 
-/* PQparamtype:
+/*
+ * PQparamtype:
  *	returns type Oid of the specified statement parameter.
  */
 Oid
@@ -3951,7 +3955,8 @@ PQparamtype(const PGresult *res, int param_num)
 }
 
 
-/* PQsetnonblocking:
+/*
+ * PQsetnonblocking:
  *	sets the PGconn's database connection non-blocking if the arg is true
  *	or makes it blocking if the arg is false, this will not protect
  *	you from PQexec(), you'll only be safe when using the non-blocking API.
diff --git a/src/interfaces/libpq/libpq-fe.h b/src/interfaces/libpq/libpq-fe.h
index f06e7a972c3..afa9b32a6b5 100644
--- a/src/interfaces/libpq/libpq-fe.h
+++ b/src/interfaces/libpq/libpq-fe.h
@@ -204,30 +204,35 @@ typedef enum
 	PQAUTHDATA_OAUTH_BEARER_TOKEN_V2,	/* newest API for OAuth Bearer tokens */
 } PGauthData;
 
-/* PGconn encapsulates a connection to the backend.
+/*
+ * PGconn encapsulates a connection to the backend.
  * The contents of this struct are not supposed to be known to applications.
  */
 typedef struct pg_conn PGconn;
 
-/* PGcancelConn encapsulates a cancel connection to the backend.
+/*
+ * PGcancelConn encapsulates a cancel connection to the backend.
  * The contents of this struct are not supposed to be known to applications.
  */
 typedef struct pg_cancel_conn PGcancelConn;
 
-/* PGresult encapsulates the result of a query (or more precisely, of a single
+/*
+ * PGresult encapsulates the result of a query (or more precisely, of a single
  * SQL command --- a query string given to PQsendQuery can contain multiple
  * commands and thus return multiple PGresult objects).
  * The contents of this struct are not supposed to be known to applications.
  */
 typedef struct pg_result PGresult;
 
-/* PGcancel encapsulates the information needed to cancel a running
+/*
+ * PGcancel encapsulates the information needed to cancel a running
  * query on an existing connection.
  * The contents of this struct are not supposed to be known to applications.
  */
 typedef struct pg_cancel PGcancel;
 
-/* PGnotify represents the occurrence of a NOTIFY message.
+/*
+ * PGnotify represents the occurrence of a NOTIFY message.
  * Ideally this would be an opaque typedef, but it's so simple that it's
  * unlikely to change.
  * NOTE: in Postgres 6.4 and later, the be_pid is the notifying backend's,
diff --git a/src/interfaces/libpq/libpq-int.h b/src/interfaces/libpq/libpq-int.h
index 23de98290c9..1b09136255d 100644
--- a/src/interfaces/libpq/libpq-int.h
+++ b/src/interfaces/libpq/libpq-int.h
@@ -90,7 +90,8 @@ typedef struct
  * hence there is no need for multiple descriptor sets.
  */
 
-/* Subsidiary-storage management structure for PGresult.
+/*
+ * Subsidiary-storage management structure for PGresult.
  * See space management routines in fe-exec.c for details.
  * Note that space[k] refers to the k'th byte starting from the physical
  * head of the block --- it's a union, not a struct!
@@ -292,7 +293,8 @@ typedef struct pgLobjfuncs
 	Oid			fn_lo_write;	/* OID of backend function LOwrite		*/
 } PGlobjfuncs;
 
-/* PGdataValue represents a data field value being passed to a row processor.
+/*
+ * PGdataValue represents a data field value being passed to a row processor.
  * It could be either text or binary data; text data is not zero-terminated.
  * A SQL NULL is represented by len < 0; then value is still valid but there
  * are no data bytes there.
@@ -689,7 +691,8 @@ struct pg_conn
 };
 
 
-/* String descriptions of the ExecStatusTypes.
+/*
+ * String descriptions of the ExecStatusTypes.
  * direct use of this array is deprecated; call PQresStatus() instead.
  */
 extern char *const pgresStatus[];
diff --git a/src/pl/plpython/plpy_elog.c b/src/pl/plpython/plpy_elog.c
index e109888cced..f41557ffb9e 100644
--- a/src/pl/plpython/plpy_elog.c
+++ b/src/pl/plpython/plpy_elog.c
@@ -589,7 +589,8 @@ get_string_attr(PyObject *obj, char *attrname, char **str)
 	Py_XDECREF(val);
 }
 
-/* set an object attribute to a string value, returns true when the set was
+/*
+ * set an object attribute to a string value, returns true when the set was
  * successful
  */
 static bool
diff --git a/src/pl/plpython/plpy_exec.c b/src/pl/plpython/plpy_exec.c
index 0117f1e77ef..de0dad1f533 100644
--- a/src/pl/plpython/plpy_exec.c
+++ b/src/pl/plpython/plpy_exec.c
@@ -306,7 +306,8 @@ PLy_exec_function(FunctionCallInfo fcinfo, PLyProcedure *proc)
 	return rv;
 }
 
-/* trigger subhandler
+/*
+ * trigger subhandler
  *
  * the python function is expected to return Py_None if the tuple is
  * acceptable and unmodified.  Otherwise it should return a PyUnicode
diff --git a/src/pl/plpython/plpy_spi.c b/src/pl/plpython/plpy_spi.c
index 46f2ca0f792..4ad40bf78f3 100644
--- a/src/pl/plpython/plpy_spi.c
+++ b/src/pl/plpython/plpy_spi.c
@@ -28,7 +28,8 @@ static PyObject *PLy_spi_execute_fetch_result(SPITupleTable *tuptable,
 static void PLy_spi_exception_set(PyObject *excclass, ErrorData *edata);
 
 
-/* prepare(query="select * from foo")
+/*
+ * prepare(query="select * from foo")
  * prepare(query="select * from foo where bar = $1", params=["text"])
  * prepare(query="select * from foo where bar = $1", params=["text"], limit=5)
  */
@@ -143,7 +144,8 @@ PLy_spi_prepare(PyObject *self, PyObject *args)
 	return (PyObject *) plan;
 }
 
-/* execute(query="select * from foo", limit=5)
+/*
+ * execute(query="select * from foo", limit=5)
  * execute(plan=plan, values=(foo, bar), limit=5)
  */
 PyObject *
diff --git a/src/port/inet_aton.c b/src/port/inet_aton.c
index adaf18adb39..367fccde422 100644
--- a/src/port/inet_aton.c
+++ b/src/port/inet_aton.c
@@ -1,4 +1,5 @@
-/* src/port/inet_aton.c
+/*
+ * src/port/inet_aton.c
  *
  *	This inet_aton() function was taken from the GNU C library and
  *	incorporated into Postgres for those systems which do not have this
@@ -36,7 +37,8 @@
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.  */
+ * SUCH DAMAGE.
+ */
 
 #include "c.h"
 
diff --git a/src/port/strlcat.c b/src/port/strlcat.c
index 190e57338e0..8335e895a5c 100644
--- a/src/port/strlcat.c
+++ b/src/port/strlcat.c
@@ -1,7 +1,8 @@
 /*
  * src/port/strlcat.c
  *
- *	$OpenBSD: strlcat.c,v 1.13 2005/08/08 08:05:37 espie Exp $	*/
+ *	$OpenBSD: strlcat.c,v 1.13 2005/08/08 08:05:37 espie Exp $
+ */
 
 /*
  * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
diff --git a/src/port/strsep.c b/src/port/strsep.c
index 564125c5101..dc7cfaea3d7 100644
--- a/src/port/strsep.c
+++ b/src/port/strsep.c
@@ -1,7 +1,8 @@
 /*
  * src/port/strsep.c
  *
- *	$OpenBSD: strsep.c,v 1.8 2015/08/31 02:53:57 guenther Exp $	*/
+ *	$OpenBSD: strsep.c,v 1.8 2015/08/31 02:53:57 guenther Exp $
+ */
 
 /*-
  * Copyright (c) 1990, 1993
diff --git a/src/test/regress/regress.c b/src/test/regress/regress.c
index 2bcb5559a45..4927f1ddcbf 100644
--- a/src/test/regress/regress.c
+++ b/src/test/regress/regress.c
@@ -162,7 +162,8 @@ overpaid(PG_FUNCTION_ARGS)
 	PG_RETURN_BOOL(salary > 699);
 }
 
-/* New type "widget"
+/*
+ * New type "widget"
  * This used to be "circle", but I added circle to builtins,
  *	so needed to make sure the names do not collide. - tgl 97/04/21
  */
diff --git a/src/timezone/localtime.c b/src/timezone/localtime.c
index ac0376b0c4d..fb04b4cf6bf 100644
--- a/src/timezone/localtime.c
+++ b/src/timezone/localtime.c
@@ -201,7 +201,8 @@ union local_storage
 	/* We don't need the "fullname" member */
 };
 
-/* Load tz data from the file named NAME into *SP.  Read extended
+/*
+ * Load tz data from the file named NAME into *SP.  Read extended
  * format if DOEXTEND.  Use *LSP for temporary storage.  Return 0 on
  * success, an errno value on failure.
  * PG: If "canonname" is not NULL, then on success the canonical spelling of
@@ -578,7 +579,8 @@ tzloadbody(char const *name, char *canonname, struct state *sp, bool doextend,
 	return 0;
 }
 
-/* Load tz data from the file named NAME into *SP.  Read extended
+/*
+ * Load tz data from the file named NAME into *SP.  Read extended
  * format if DOEXTEND.  Return 0 on success, an errno value on failure.
  * PG: If "canonname" is not NULL, then on success the canonical spelling of
  * given name is stored there (the buffer must be > TZ_STRLEN_MAX bytes!).
diff --git a/src/tutorial/complex.c b/src/tutorial/complex.c
index 46dc54e62d0..6354ae6aa72 100644
--- a/src/tutorial/complex.c
+++ b/src/tutorial/complex.c
@@ -2,9 +2,9 @@
  * 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.
+ *  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"
