diff --git a/src/test/modules/test_saslprep/t/001_saslprep_ranges.pl b/src/test/modules/test_saslprep/t/001_saslprep_ranges.pl
index b353017c065..3ff0e3b10e6 100644
--- a/src/test/modules/test_saslprep/t/001_saslprep_ranges.pl
+++ b/src/test/modules/test_saslprep/t/001_saslprep_ranges.pl
@@ -32,7 +32,8 @@ my $result = $node->safe_psql(
   WHERE status = 'SUCCESS' AND res IN (NULL, '')
 ]);
 
-is($result, 'U+0000|SUCCESS|\x00|\x', "valid codepoints returning an empty password");
+is($result, 'U+0000|SUCCESS|\x00|\x',
+	"valid codepoints returning an empty password");
 
 $node->stop;
 done_testing();
diff --git a/src/test/modules/test_saslprep/test_saslprep.c b/src/test/modules/test_saslprep/test_saslprep.c
index b4deab1b52f..70ff7069bf7 100644
--- a/src/test/modules/test_saslprep/test_saslprep.c
+++ b/src/test/modules/test_saslprep/test_saslprep.c
@@ -65,8 +65,8 @@ test_saslprep(PG_FUNCTION_ARGS)
 	Size		result_len;
 	bytea	   *result_bytea = NULL;
 	const char *status = NULL;
-	Datum      *values;
-	bool       *nulls;
+	Datum	   *values;
+	bool	   *nulls;
 	TupleDesc	tupdesc;
 	pg_saslprep_rc rc;
 
@@ -123,16 +123,16 @@ typedef struct
 
 static const pg_utf8_codepoint_range pg_utf8_test_ranges[] = {
 	/* 1, 2, 3 bytes */
-	{0x0000, 0xD7FF}, /* Basic Multilingual Plane, before surrogates */
-	{0xE000, 0xFFFF}, /* Basic Multilingual Plane, after surrogates */
+	{0x0000, 0xD7FF},			/* Basic Multilingual Plane, before surrogates */
+	{0xE000, 0xFFFF},			/* Basic Multilingual Plane, after surrogates */
 	/* 4 bytes */
-	{0x10000, 0x1FFFF}, /* Supplementary Multilingual Plane */
-	{0x20000, 0x2FFFF}, /* Supplementary Ideographic Plane */
-	{0x30000, 0x3FFFF}, /* Tertiary Ideographic Plane */
-	{0x40000, 0xDFFFF}, /* Unassigned planes */
-	{0xE0000, 0xEFFFF}, /* Supplementary Special-purpose Plane */
-	{0xF0000, 0xFFFFF}, /* Private Use Area A */
-	{0x100000, 0x10FFFF}, /* Private Use Area B */
+	{0x10000, 0x1FFFF},			/* Supplementary Multilingual Plane */
+	{0x20000, 0x2FFFF},			/* Supplementary Ideographic Plane */
+	{0x30000, 0x3FFFF},			/* Tertiary Ideographic Plane */
+	{0x40000, 0xDFFFF},			/* Unassigned planes */
+	{0xE0000, 0xEFFFF},			/* Supplementary Special-purpose Plane */
+	{0xF0000, 0xFFFFF},			/* Private Use Area A */
+	{0x100000, 0x10FFFF},		/* Private Use Area B */
 };
 
 #define PG_UTF8_TEST_RANGES_LEN \
diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list
index 174e2798443..4673eca9cd6 100644
--- a/src/tools/pgindent/typedefs.list
+++ b/src/tools/pgindent/typedefs.list
@@ -3977,6 +3977,7 @@ pg_regex_t
 pg_regmatch_t
 pg_regoff_t
 pg_saslprep_rc
+pg_saslprep_test_context
 pg_sha1_ctx
 pg_sha224_ctx
 pg_sha256_ctx
@@ -4000,6 +4001,7 @@ pg_unicode_properties
 pg_unicode_range
 pg_unicode_recompinfo
 pg_usec_time_t
+pg_utf8_codepoint_range
 pg_utf_to_local_combined
 pg_uuid_t
 pg_wchar