diff --git a/src/backend/utils/adt/jsonfuncs.c b/src/backend/utils/adt/jsonfuncs.c
index 64c85e9ddd1..adbafd0ecd3 100644
--- a/src/backend/utils/adt/jsonfuncs.c
+++ b/src/backend/utils/adt/jsonfuncs.c
@@ -233,7 +233,7 @@ struct RecordIOData
 	Oid			record_type;
 	int32		record_typmod;
 	int			ncolumns;
-	ColumnIOData columns[FLEXIBLE_ARRAY_MEMBER] pg_attribute_counted_by(ncolumns);
+	pg_attribute_counted_by(ncolumns) ColumnIOData columns[FLEXIBLE_ARRAY_MEMBER];
 };
 
 /* per-query cache for populate_record_worker and populate_recordset_worker */
diff --git a/src/tools/pgindent/pgindent b/src/tools/pgindent/pgindent
index 1dcd47e04c9..ee30da799b4 100755
--- a/src/tools/pgindent/pgindent
+++ b/src/tools/pgindent/pgindent
@@ -238,6 +238,7 @@ sub write_source
 # Declaration attributes that pg_bsd_indent doesn't know how to handle.
 my @declaration_attributes = qw(
   alignas
+  pg_attribute_counted_by
 );
 
 # Text of each declaration attribute, stashed by pre_indent() and restored