diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h
index f763f790b1..0cab890843 100644
--- a/src/include/nodes/parsenodes.h
+++ b/src/include/nodes/parsenodes.h
@@ -1799,7 +1799,7 @@ typedef struct JsonFuncExpr
 	JsonBehavior *on_error;		/* ON ERROR behavior */
 	JsonWrapper wrapper;		/* array wrapper behavior (JSON_QUERY only) */
 	JsonQuotes	quotes;			/* omit or keep quotes? (JSON_QUERY only) */
-	int			location;		/* token location, or -1 if unknown */
+	ParseLoc	location;		/* token location, or -1 if unknown */
 } JsonFuncExpr;
 
 /*
@@ -1813,8 +1813,8 @@ typedef struct JsonTablePathSpec
 
 	Node	   *string;
 	char	   *name;
-	int			name_location;
-	int			location;		/* location of 'string' */
+	ParseLoc	name_location;
+	ParseLoc	location;		/* location of 'string' */
 } JsonTablePathSpec;
 
 /*
@@ -1831,7 +1831,7 @@ typedef struct JsonTable
 	JsonBehavior *on_error;		/* ON ERROR behavior */
 	Alias	   *alias;			/* table alias in FROM clause */
 	bool		lateral;		/* does it have LATERAL prefix? */
-	int			location;		/* token location, or -1 if unknown */
+	ParseLoc	location;		/* token location, or -1 if unknown */
 } JsonTable;
 
 /*
@@ -1864,7 +1864,7 @@ typedef struct JsonTableColumn
 	List	   *columns;		/* nested columns */
 	JsonBehavior *on_empty;		/* ON EMPTY behavior */
 	JsonBehavior *on_error;		/* ON ERROR behavior */
-	int			location;		/* token location, or -1 if unknown */
+	ParseLoc	location;		/* token location, or -1 if unknown */
 } JsonTableColumn;
 
 /*
diff --git a/src/include/nodes/primnodes.h b/src/include/nodes/primnodes.h
index dafe93a4c9..6b0172f427 100644
--- a/src/include/nodes/primnodes.h
+++ b/src/include/nodes/primnodes.h
@@ -1756,7 +1756,7 @@ typedef struct JsonBehavior
 	JsonBehaviorType btype;
 	Node	   *expr;
 	bool		coerce;
-	int			location;		/* token location, or -1 if unknown */
+	ParseLoc	location;		/* token location, or -1 if unknown */
 } JsonBehavior;
 
 /*
@@ -1825,7 +1825,7 @@ typedef struct JsonExpr
 	Oid			collation;
 
 	/* Original JsonFuncExpr's location */
-	int			location;
+	ParseLoc	location;
 } JsonExpr;
 
 /*