diff --git a/src/backend/utils/adt/jsonb_util.c b/src/backend/utils/adt/jsonb_util.c
index 1caaa4a9cc..a9bf0d3a7d 100644
--- a/src/backend/utils/adt/jsonb_util.c
+++ b/src/backend/utils/adt/jsonb_util.c
@@ -953,10 +953,10 @@ JsonbDeepContains(JsonbIterator **val, JsonbIterator **mContained)
 		 * arrays.
 		 *
 		 * A raw scalar may contain another raw scalar, and an array may
-		 * contain a raw scalar, but a raw scalar may not contain an array.
-		 * We don't do something like this for the object case, since objects
-		 * can only contain pairs, never raw scalars (a pair is represented by
-		 * an rhs object argument with a single contained pair).
+		 * contain a raw scalar, but a raw scalar may not contain an array. We
+		 * don't do something like this for the object case, since objects can
+		 * only contain pairs, never raw scalars (a pair is represented by an
+		 * rhs object argument with a single contained pair).
 		 */
 		if (vval.val.array.rawScalar && !vcontained.val.array.rawScalar)
 			return false;
diff --git a/src/interfaces/ecpg/include/sqlda.h b/src/interfaces/ecpg/include/sqlda.h
index b1b4debf90..c265beb66c 100644
--- a/src/interfaces/ecpg/include/sqlda.h
+++ b/src/interfaces/ecpg/include/sqlda.h
@@ -4,15 +4,15 @@
 #ifdef _ECPG_INFORMIX_H
 
 #include "sqlda-compat.h"
-typedef struct sqlvar_compat	sqlvar_t;
-typedef struct sqlda_compat	sqlda_t;
+typedef struct sqlvar_compat sqlvar_t;
+typedef struct sqlda_compat sqlda_t;
 
 #else
 
 #include "sqlda-native.h"
-typedef struct sqlvar_struct	sqlvar_t;
-typedef struct sqlda_struct	sqlda_t;
+typedef struct sqlvar_struct sqlvar_t;
+typedef struct sqlda_struct sqlda_t;
 
 #endif
 
-#endif /* ECPG_SQLDA_H */
+#endif   /* ECPG_SQLDA_H */
diff --git a/src/interfaces/ecpg/include/sqltypes.h b/src/interfaces/ecpg/include/sqltypes.h
index 0c01867d02..797cb5b1be 100644
--- a/src/interfaces/ecpg/include/sqltypes.h
+++ b/src/interfaces/ecpg/include/sqltypes.h
@@ -32,26 +32,26 @@
 /*
  * Values used in sqlda->sqlvar[i]->sqltype
  */
-#define	SQLCHAR		ECPGt_char
-#define	SQLSMINT	ECPGt_short
-#define	SQLINT		ECPGt_int
-#define	SQLFLOAT	ECPGt_double
-#define	SQLSMFLOAT	ECPGt_float
-#define	SQLDECIMAL	ECPGt_decimal
-#define	SQLSERIAL	ECPGt_int
-#define	SQLDATE		ECPGt_date
-#define	SQLDTIME	ECPGt_timestamp
-#define	SQLTEXT		ECPGt_char
-#define	SQLVCHAR	ECPGt_char
-#define SQLINTERVAL     ECPGt_interval
-#define	SQLNCHAR	ECPGt_char
-#define	SQLNVCHAR	ECPGt_char
+#define SQLCHAR		ECPGt_char
+#define SQLSMINT	ECPGt_short
+#define SQLINT		ECPGt_int
+#define SQLFLOAT	ECPGt_double
+#define SQLSMFLOAT	ECPGt_float
+#define SQLDECIMAL	ECPGt_decimal
+#define SQLSERIAL	ECPGt_int
+#define SQLDATE		ECPGt_date
+#define SQLDTIME	ECPGt_timestamp
+#define SQLTEXT		ECPGt_char
+#define SQLVCHAR	ECPGt_char
+#define SQLINTERVAL		ECPGt_interval
+#define SQLNCHAR	ECPGt_char
+#define SQLNVCHAR	ECPGt_char
 #ifdef HAVE_LONG_LONG_INT_64
-#define	SQLINT8		ECPGt_long_long
-#define	SQLSERIAL8	ECPGt_long_long
+#define SQLINT8		ECPGt_long_long
+#define SQLSERIAL8	ECPGt_long_long
 #else
-#define	SQLINT8		ECPGt_long
-#define	SQLSERIAL8	ECPGt_long
+#define SQLINT8		ECPGt_long
+#define SQLSERIAL8	ECPGt_long
 #endif
 
 #endif   /* ndef ECPG_SQLTYPES_H */
diff --git a/src/interfaces/ecpg/test/expected/compat_informix-describe.c b/src/interfaces/ecpg/test/expected/compat_informix-describe.c
index 59002fbde6..5951ae6c82 100644
--- a/src/interfaces/ecpg/test/expected/compat_informix-describe.c
+++ b/src/interfaces/ecpg/test/expected/compat_informix-describe.c
@@ -30,18 +30,18 @@
 #ifdef _ECPG_INFORMIX_H
 
 #include "sqlda-compat.h"
-typedef struct sqlvar_compat	sqlvar_t;
-typedef struct sqlda_compat	sqlda_t;
+typedef struct sqlvar_compat sqlvar_t;
+typedef struct sqlda_compat sqlda_t;
 
 #else
 
 #include "sqlda-native.h"
-typedef struct sqlvar_struct	sqlvar_t;
-typedef struct sqlda_struct	sqlda_t;
+typedef struct sqlvar_struct sqlvar_t;
+typedef struct sqlda_struct sqlda_t;
 
 #endif
 
-#endif /* ECPG_SQLDA_H */
+#endif   /* ECPG_SQLDA_H */
 
 #line 5 "describe.pgc"
 
diff --git a/src/interfaces/ecpg/test/expected/compat_informix-sqlda.c b/src/interfaces/ecpg/test/expected/compat_informix-sqlda.c
index a013be99aa..6cfca27018 100644
--- a/src/interfaces/ecpg/test/expected/compat_informix-sqlda.c
+++ b/src/interfaces/ecpg/test/expected/compat_informix-sqlda.c
@@ -32,18 +32,18 @@
 #ifdef _ECPG_INFORMIX_H
 
 #include "sqlda-compat.h"
-typedef struct sqlvar_compat	sqlvar_t;
-typedef struct sqlda_compat	sqlda_t;
+typedef struct sqlvar_compat sqlvar_t;
+typedef struct sqlda_compat sqlda_t;
 
 #else
 
 #include "sqlda-native.h"
-typedef struct sqlvar_struct	sqlvar_t;
-typedef struct sqlda_struct	sqlda_t;
+typedef struct sqlvar_struct sqlvar_t;
+typedef struct sqlda_struct sqlda_t;
 
 #endif
 
-#endif /* ECPG_SQLDA_H */
+#endif   /* ECPG_SQLDA_H */
 
 #line 7 "sqlda.pgc"
 
@@ -83,26 +83,26 @@ typedef struct sqlda_struct	sqlda_t;
 /*
  * Values used in sqlda->sqlvar[i]->sqltype
  */
-#define	SQLCHAR		ECPGt_char
-#define	SQLSMINT	ECPGt_short
-#define	SQLINT		ECPGt_int
-#define	SQLFLOAT	ECPGt_double
-#define	SQLSMFLOAT	ECPGt_float
-#define	SQLDECIMAL	ECPGt_decimal
-#define	SQLSERIAL	ECPGt_int
-#define	SQLDATE		ECPGt_date
-#define	SQLDTIME	ECPGt_timestamp
-#define	SQLTEXT		ECPGt_char
-#define	SQLVCHAR	ECPGt_char
-#define SQLINTERVAL     ECPGt_interval
-#define	SQLNCHAR	ECPGt_char
-#define	SQLNVCHAR	ECPGt_char
+#define SQLCHAR		ECPGt_char
+#define SQLSMINT	ECPGt_short
+#define SQLINT		ECPGt_int
+#define SQLFLOAT	ECPGt_double
+#define SQLSMFLOAT	ECPGt_float
+#define SQLDECIMAL	ECPGt_decimal
+#define SQLSERIAL	ECPGt_int
+#define SQLDATE		ECPGt_date
+#define SQLDTIME	ECPGt_timestamp
+#define SQLTEXT		ECPGt_char
+#define SQLVCHAR	ECPGt_char
+#define SQLINTERVAL		ECPGt_interval
+#define SQLNCHAR	ECPGt_char
+#define SQLNVCHAR	ECPGt_char
 #ifdef HAVE_LONG_LONG_INT_64
-#define	SQLINT8		ECPGt_long_long
-#define	SQLSERIAL8	ECPGt_long_long
+#define SQLINT8		ECPGt_long_long
+#define SQLSERIAL8	ECPGt_long_long
 #else
-#define	SQLINT8		ECPGt_long
-#define	SQLSERIAL8	ECPGt_long
+#define SQLINT8		ECPGt_long
+#define SQLSERIAL8	ECPGt_long
 #endif
 
 #endif   /* ndef ECPG_SQLTYPES_H */
diff --git a/src/interfaces/ecpg/test/expected/sql-describe.c b/src/interfaces/ecpg/test/expected/sql-describe.c
index 11aadb4e05..356f5870e8 100644
--- a/src/interfaces/ecpg/test/expected/sql-describe.c
+++ b/src/interfaces/ecpg/test/expected/sql-describe.c
@@ -28,18 +28,18 @@
 #ifdef _ECPG_INFORMIX_H
 
 #include "sqlda-compat.h"
-typedef struct sqlvar_compat	sqlvar_t;
-typedef struct sqlda_compat	sqlda_t;
+typedef struct sqlvar_compat sqlvar_t;
+typedef struct sqlda_compat sqlda_t;
 
 #else
 
 #include "sqlda-native.h"
-typedef struct sqlvar_struct	sqlvar_t;
-typedef struct sqlda_struct	sqlda_t;
+typedef struct sqlvar_struct sqlvar_t;
+typedef struct sqlda_struct sqlda_t;
 
 #endif
 
-#endif /* ECPG_SQLDA_H */
+#endif   /* ECPG_SQLDA_H */
 
 #line 5 "describe.pgc"
 
diff --git a/src/interfaces/ecpg/test/expected/sql-sqlda.c b/src/interfaces/ecpg/test/expected/sql-sqlda.c
index e0c35b2ebc..bc9125ab3c 100644
--- a/src/interfaces/ecpg/test/expected/sql-sqlda.c
+++ b/src/interfaces/ecpg/test/expected/sql-sqlda.c
@@ -30,18 +30,18 @@
 #ifdef _ECPG_INFORMIX_H
 
 #include "sqlda-compat.h"
-typedef struct sqlvar_compat	sqlvar_t;
-typedef struct sqlda_compat	sqlda_t;
+typedef struct sqlvar_compat sqlvar_t;
+typedef struct sqlda_compat sqlda_t;
 
 #else
 
 #include "sqlda-native.h"
-typedef struct sqlvar_struct	sqlvar_t;
-typedef struct sqlda_struct	sqlda_t;
+typedef struct sqlvar_struct sqlvar_t;
+typedef struct sqlda_struct sqlda_t;
 
 #endif
 
-#endif /* ECPG_SQLDA_H */
+#endif   /* ECPG_SQLDA_H */
 
 #line 7 "sqlda.pgc"