diff --git a/src/tools/pgindent/pgindent b/src/tools/pgindent/pgindent
index b69c3ce3d4..19993d31aa 100755
--- a/src/tools/pgindent/pgindent
+++ b/src/tools/pgindent/pgindent
@@ -107,8 +107,6 @@ do
 	indent -bad -bap -bc -bl -d0 -cdb -nce -nfc1 -di12 -i4 -l79 \
 		-lp -nip -npro -bbb $EXTRA_OPTS \
 -TAES_KEY \
--TAMT \
--TAMTS \
 -TASN1_BIT_STRING \
 -TASN1_BMPSTRING \
 -TASN1_BOOLEAN \
@@ -139,7 +137,6 @@ do
 -TASN1_UTF8STRING \
 -TASN1_VALUE \
 -TASN1_VISIBLESTRING \
--TAV \
 -TA_Const \
 -TA_Expr \
 -TA_Expr_Kind \
@@ -147,13 +144,18 @@ do
 -TA_Indirection \
 -TAbsoluteTime \
 -TAcl \
--TAclId \
 -TAclItem \
 -TAclMaskHow \
 -TAclMode \
 -TAclObjectKind \
 -TAclResult \
+-TAfterTriggerEvent \
+-TAfterTriggerEventData \
+-TAfterTriggerEventList \
+-TAfterTriggers \
+-TAfterTriggersData \
 -TAgg \
+-TAggClauseCounts \
 -TAggHashEntry \
 -TAggHashEntryData \
 -TAggInfo \
@@ -177,14 +179,14 @@ do
 -TAllocateDescKind \
 -TAlterDatabaseSetStmt \
 -TAlterDomainStmt \
--TAlterGroupStmt \
+-TAlterFunctionStmt \
 -TAlterOwnerStmt \
+-TAlterRoleSetStmt \
+-TAlterRoleStmt \
 -TAlterSeqStmt \
 -TAlterTableCmd \
 -TAlterTableStmt \
 -TAlterTableType \
--TAlterUserSetStmt \
--TAlterUserStmt \
 -TAlteredTableInfo \
 -TAnalyzeAttrFetchFunc \
 -TAnlIndexData \
@@ -200,10 +202,12 @@ do
 -TArrayBuildState \
 -TArrayExpr \
 -TArrayExprState \
+-TArrayMapState \
 -TArrayMetaState \
 -TArrayParseState \
 -TArrayRef \
 -TArrayRefExprState \
+-TArrayTuple \
 -TArrayType \
 -TAttInMetadata \
 -TAttrDefInfo \
@@ -212,13 +216,11 @@ do
 -TAuthRequest \
 -TBF_KEY \
 -TBIGNUM \
--TBINOP \
 -TBIO \
 -TBIO_F_BUFFER_CTX \
 -TBIO_METHOD \
 -TBIO_dummy \
 -TBIT_STRING_BITNAME \
--TBLOCK \
 -TBMS_Membership \
 -TBN_BLINDING \
 -TBN_CTX \
@@ -243,6 +245,17 @@ do
 -TBackendId \
 -TBgWriterRequest \
 -TBgWriterShmemStruct \
+-TBitmapAnd \
+-TBitmapAndPath \
+-TBitmapAndState \
+-TBitmapHeapPath \
+-TBitmapHeapScan \
+-TBitmapHeapScanState \
+-TBitmapIndexScan \
+-TBitmapIndexScanState \
+-TBitmapOr \
+-TBitmapOrPath \
+-TBitmapOrState \
 -TBitmapset \
 -TBkpBlock \
 -TBlock \
@@ -264,7 +277,6 @@ do
 -TBuffer \
 -TBufferDesc \
 -TBufferLookupEnt \
--TBufferStrategyCDB \
 -TBufferStrategyControl \
 -TBufferTag \
 -TByte \
@@ -276,8 +288,6 @@ do
 -TCIRCLE \
 -TCOMP_CTX \
 -TCOMP_METHOD \
--TCONDOP \
--TCOP \
 -TCPFunction \
 -TCPPFunction \
 -TCRYPTO_EX_DATA \
@@ -288,8 +298,6 @@ do
 -TCRYPTO_EX_new \
 -TCRYPTO_MEM_LEAK_CB \
 -TCRYPTO_dynlock \
--TCURCUR \
--TCV \
 -TCacheCallbackFunction \
 -TCancelRequestPacket \
 -TCaseExpr \
@@ -310,7 +318,6 @@ do
 -TCheckPointStmt \
 -TChromosome \
 -TCity \
--TClientData \
 -TClosePortalStmt \
 -TClosePtr \
 -TClusterStmt \
@@ -342,6 +349,8 @@ do
 -TContainsOids \
 -TControlFileData \
 -TConvInfo \
+-TConvertRowtypeExpr \
+-TConvertRowtypeExprState \
 -TCookedConstraint \
 -TCopyDest \
 -TCopyReadResult \
@@ -352,10 +361,10 @@ do
 -TCreateConversionStmt \
 -TCreateDomainStmt \
 -TCreateFunctionStmt \
--TCreateGroupStmt \
 -TCreateOpClassItem \
 -TCreateOpClassStmt \
 -TCreatePLangStmt \
+-TCreateRoleStmt \
 -TCreateSchemaStmt \
 -TCreateSchemaStmtContext \
 -TCreateSeqStmt \
@@ -363,7 +372,6 @@ do
 -TCreateStmtContext \
 -TCreateTableSpaceStmt \
 -TCreateTrigStmt \
--TCreateUserStmt \
 -TCreatedbStmt \
 -TCred \
 -TCtlCommand \
@@ -390,15 +398,6 @@ do
 -TDeallocateStmt \
 -TDeclareCursorStmt \
 -TDefElem \
--TDeferredTriggerEvent \
--TDeferredTriggerEventData \
--TDeferredTriggerEventItem \
--TDeferredTriggerState \
--TDeferredTriggerStateData \
--TDeferredTriggerStatus \
--TDeferredTriggerStatusData \
--TDeferredTriggers \
--TDeferredTriggersData \
 -TDefineStmt \
 -TDeleteStmt \
 -TDependencyType \
@@ -411,17 +410,15 @@ do
 -TDomainConstraintType \
 -TDropBehavior \
 -TDropCastStmt \
--TDropGroupStmt \
 -TDropPLangStmt \
 -TDropPropertyStmt \
+-TDropRoleStmt \
 -TDropStmt \
 -TDropTableSpaceStmt \
--TDropUserStmt \
 -TDropdbStmt \
 -TDumpId \
 -TDumpableObject \
 -TDumpableObjectType \
--TDupHashTabEntry \
 -TDynamicFileList \
 -TEDGE \
 -TENGINE \
@@ -441,10 +438,10 @@ do
 -TEndBlobPtr \
 -TEndBlobsPtr \
 -TEndDataPtr \
+-TEntryUpdateRecord \
 -TEolType \
 -TErrorContextCallback \
 -TErrorData \
--TExceptionLabelMap \
 -TExecContext \
 -TExecContextData \
 -TExecScanAccessMtd \
@@ -460,7 +457,6 @@ do
 -TExprDoneCond \
 -TExprState \
 -TExprStateEvalFunc \
--TFF \
 -TFILE \
 -TFSMHeader \
 -TFSMPageData \
@@ -484,6 +480,8 @@ do
 -TFormData_pg_amproc \
 -TFormData_pg_attrdef \
 -TFormData_pg_attribute \
+-TFormData_pg_auth_members \
+-TFormData_pg_authid \
 -TFormData_pg_cast \
 -TFormData_pg_class \
 -TFormData_pg_constraint \
@@ -491,7 +489,6 @@ do
 -TFormData_pg_database \
 -TFormData_pg_depend \
 -TFormData_pg_description \
--TFormData_pg_group \
 -TFormData_pg_index \
 -TFormData_pg_inherits \
 -TFormData_pg_language \
@@ -503,7 +500,6 @@ do
 -TFormData_pg_proc \
 -TFormData_pg_rewrite \
 -TFormData_pg_sequence \
--TFormData_pg_shadow \
 -TFormData_pg_statistic \
 -TFormData_pg_tablespace \
 -TFormData_pg_trigger \
@@ -514,6 +510,8 @@ do
 -TForm_pg_amproc \
 -TForm_pg_attrdef \
 -TForm_pg_attribute \
+-TForm_pg_auth_members \
+-TForm_pg_authid \
 -TForm_pg_cast \
 -TForm_pg_class \
 -TForm_pg_constraint \
@@ -521,7 +519,6 @@ do
 -TForm_pg_database \
 -TForm_pg_depend \
 -TForm_pg_description \
--TForm_pg_group \
 -TForm_pg_index \
 -TForm_pg_inherits \
 -TForm_pg_language \
@@ -533,7 +530,6 @@ do
 -TForm_pg_proc \
 -TForm_pg_rewrite \
 -TForm_pg_sequence \
--TForm_pg_shadow \
 -TForm_pg_statistic \
 -TForm_pg_tablespace \
 -TForm_pg_trigger \
@@ -554,34 +550,41 @@ do
 -TFunctionCallInfo \
 -TFunctionCallInfoData \
 -TFunctionParameter \
+-TFunctionParameterMode \
 -TFunctionScan \
 -TFunctionScanState \
 -TGEN_SESSION_CB \
 -TGISTBuildState \
 -TGISTENTRY \
+-TGISTInsertStack \
+-TGISTInsertState \
 -TGISTPageOpaque \
 -TGISTPageOpaqueData \
--TGISTSTACK \
 -TGISTSTATE \
 -TGISTScanList \
 -TGISTScanListData \
 -TGISTScanOpaque \
 -TGISTScanOpaqueData \
+-TGISTSearchStack \
 -TGIST_SPLITVEC \
--TGP \
 -TGUC_yy_size_t \
 -TGUC_yy_state_type \
--TGV \
--TGVOP \
 -TGene \
 -TGenericExprState \
 -TGeqoEvalData \
+-TGistBDItem \
 -TGistEntryVector \
+-TGistNSN \
+-TGistVacuum \
+-TGlobalTransaction \
+-TGlobalTransactionData \
 -TGrantObjectType \
+-TGrantRoleStmt \
 -TGrantStmt \
 -TGroup \
 -TGroupClause \
 -TGroupState \
+-TGroupVarInfo \
 -TGucBoolAssignHook \
 -TGucContext \
 -TGucIntAssignHook \
@@ -597,22 +600,22 @@ do
 -THASHHDR \
 -THASHSEGMENT \
 -THASH_SEQ_STATUS \
--THE \
--THEK \
 -THISTORY_STATE \
 -THIST_ENTRY \
 -THTAB \
+-THTSU_Result \
 -THTSV_Result \
--THV \
 -THash \
 -THashAllocFunc \
 -THashBuildState \
 -THashCompareFunc \
+-THashCopyFunc \
 -THashItem \
 -THashItemData \
 -THashJoin \
 -THashJoinState \
 -THashJoinTable \
+-THashJoinTableData \
 -THashJoinTuple \
 -THashJoinTupleData \
 -THashMetaPage \
@@ -625,7 +628,6 @@ do
 -THashScanOpaque \
 -THashScanOpaqueData \
 -THashState \
--THashTableData \
 -THashValueFunc \
 -THeapScanDesc \
 -THeapScanDescData \
@@ -634,13 +636,7 @@ do
 -THeapTupleFields \
 -THeapTupleHeader \
 -THeapTupleHeaderData \
--TI16 \
--TI32 \
--TI8 \
--TIO \
 -TIOFuncSelector \
--TIV \
--TIV64 \
 -TIdList \
 -TInClauseInfo \
 -TIncrementVarSublevelsUp_context \
@@ -672,8 +668,6 @@ do
 -TInhPaths \
 -TInhRelation \
 -TInnerIndexscanInfo \
--TInsertIndexResult \
--TInsertIndexResultData \
 -TInsertStmt \
 -TInstrumentation \
 -TInt8TransTypeData \
@@ -696,10 +690,9 @@ do
 -TItemOffset \
 -TItemPointer \
 -TItemPointerData \
--TJMPENV \
 -TJoin \
 -TJoinExpr \
--TJoinInfo \
+-TJoinHashEntry \
 -TJoinPath \
 -TJoinState \
 -TJoinType \
@@ -716,7 +709,6 @@ do
 -TLHASH_HASH_FN_TYPE \
 -TLHASH_NODE \
 -TLINE \
--TLISTOP \
 -TLOCALLOCK \
 -TLOCALLOCKOWNER \
 -TLOCALLOCKTAG \
@@ -725,8 +717,6 @@ do
 -TLOCKMETHODID \
 -TLOCKMODE \
 -TLOCKTAG \
--TLOGOP \
--TLOOP \
 -TLSEG \
 -TLVRelStats \
 -TLWLock \
@@ -740,7 +730,9 @@ do
 -TListCell \
 -TListenStmt \
 -TLoadStmt \
+-TLocalBufferLookupEnt \
 -TLocationIndex \
+-TLockAcquireResult \
 -TLockData \
 -TLockInfo \
 -TLockInfoData \
@@ -748,15 +740,15 @@ do
 -TLockMethodData \
 -TLockRelId \
 -TLockStmt \
+-TLockTagType \
+-TLockTupleMode \
 -TLogStmtLevel \
 -TLogicalTape \
 -TLogicalTapeSet \
--TMAGIC \
 -TMD2_CTX \
 -TMD4_CTX \
 -TMD5_CTX \
 -TMDC2_CTX \
--TMGVTBL \
 -TMaterial \
 -TMaterialPath \
 -TMaterialState \
@@ -764,11 +756,20 @@ do
 -TMemoryContext \
 -TMemoryContextData \
 -TMemoryContextMethods \
+-TMergeFunctionKind \
 -TMergeJoin \
+-TMergeJoinClause \
+-TMergeJoinClauseData \
 -TMergeJoinState \
 -TMergePath \
+-TMinMaxAggInfo \
+-TMinMaxExpr \
+-TMinMaxExprState \
+-TMinMaxOp \
 -TMsgType \
--TMyVarInfo \
+-TMultiXactId \
+-TMultiXactOffset \
+-TMultiXactStateData \
 -TNETSCAPE_CERT_SEQUENCE \
 -TNETSCAPE_SPKAC \
 -TNETSCAPE_SPKI \
@@ -776,7 +777,6 @@ do
 -TNUMDesc \
 -TNUMProc \
 -TNUM_poz \
--TNV \
 -TName \
 -TNameData \
 -TNamespaceInfo \
@@ -785,6 +785,7 @@ do
 -TNestPath \
 -TNewColumnValue \
 -TNewConstraint \
+-TNewPage \
 -TNode \
 -TNodeTag \
 -TNotifyStmt \
@@ -796,7 +797,6 @@ do
 -TNumericDigit \
 -TNumericVar \
 -TOBJ_NAME \
--TOP \
 -TObjectAddress \
 -TObjectAddresses \
 -TObjectClass \
@@ -817,8 +817,6 @@ do
 -TOperator \
 -TOprInfo \
 -TOutputContext \
--TOutrec \
--TPADOFFSET \
 -TPATH \
 -TPBE2PARAM \
 -TPBEPARAM \
@@ -826,9 +824,6 @@ do
 -TPEM_CTX \
 -TPEM_ENCODE_SEAL_CTX \
 -TPEM_USER \
--TPERL_CONTEXT \
--TPERL_SI \
--TPGAsyncStatusType \
 -TPGErrorVerbosity \
 -TPGFInfoFunction \
 -TPGFunction \
@@ -836,23 +831,17 @@ do
 -TPGLZ_Header \
 -TPGLZ_HistEntry \
 -TPGLZ_Strategy \
--TPGMessageField \
--TPGNoticeHooks \
 -TPGPROC \
 -TPGSemaphore \
 -TPGSemaphoreData \
--TPGSetenvStatusType \
 -TPGShmemHeader \
 -TPGTransactionStatusType \
 -TPGVerbosity \
 -TPG_Lock_Status \
+-TPGcancel \
 -TPGconn \
--TPGlobjfuncs \
 -TPGnotify \
--TPGresAttDesc \
--TPGresAttValue \
 -TPGresult \
--TPGresult_data \
 -TPKCS7 \
 -TPKCS7_DIGEST \
 -TPKCS7_ENCRYPT \
@@ -864,54 +853,9 @@ do
 -TPKCS7_SIGNER_INFO \
 -TPKCS7_SIGN_ENVELOPE \
 -TPKCS8_PRIV_KEY_INFO \
--TPLPGSQL_YYSTYPE \
--TPLpgSQL_arrayelem \
--TPLpgSQL_condition \
--TPLpgSQL_datum \
--TPLpgSQL_diag_item \
--TPLpgSQL_dstring \
--TPLpgSQL_exception \
--TPLpgSQL_exceptions \
--TPLpgSQL_execstate \
--TPLpgSQL_expr \
--TPLpgSQL_func_hashkey \
--TPLpgSQL_function \
--TPLpgSQL_ns \
--TPLpgSQL_nsitem \
--TPLpgSQL_rec \
--TPLpgSQL_recfield \
--TPLpgSQL_row \
--TPLpgSQL_stmt \
--TPLpgSQL_stmt_assign \
--TPLpgSQL_stmt_block \
--TPLpgSQL_stmt_close \
--TPLpgSQL_stmt_dynexecute \
--TPLpgSQL_stmt_dynfors \
--TPLpgSQL_stmt_execsql \
--TPLpgSQL_stmt_exit \
--TPLpgSQL_stmt_fetch \
--TPLpgSQL_stmt_fori \
--TPLpgSQL_stmt_fors \
--TPLpgSQL_stmt_getdiag \
--TPLpgSQL_stmt_if \
--TPLpgSQL_stmt_loop \
--TPLpgSQL_stmt_open \
--TPLpgSQL_stmt_perform \
--TPLpgSQL_stmt_raise \
--TPLpgSQL_stmt_return \
--TPLpgSQL_stmt_return_next \
--TPLpgSQL_stmt_select \
--TPLpgSQL_stmt_while \
--TPLpgSQL_stmts \
--TPLpgSQL_trigarg \
--TPLpgSQL_type \
--TPLpgSQL_var \
--TPLpgSQL_variable \
--TPMOP \
 -TPMSignalReason \
 -TPOLYGON \
 -TPQArgBlock \
--TPQEnvironmentOption \
 -TPQExpBuffer \
 -TPQExpBufferData \
 -TPQconninfoOption \
@@ -922,13 +866,13 @@ do
 -TPROCLOCKTAG \
 -TPROC_HDR \
 -TPROC_QUEUE \
--TPV \
--TPVOP \
 -TPacketLen \
 -TPage \
 -TPageFreeSpaceInfo \
 -TPageHeader \
 -TPageHeaderData \
+-TPageSplitRecord \
+-TPagetableEntry \
 -TParam \
 -TParamExecData \
 -TParamListInfo \
@@ -942,8 +886,6 @@ do
 -TPattern_Type \
 -TPendingOperationEntry \
 -TPendingRelDelete \
--TPerlExitListEntry \
--TPerlInterpreter \
 -TPgStat_Counter \
 -TPgStat_Info \
 -TPgStat_Msg \
@@ -964,6 +906,7 @@ do
 -TPg_finfo_record \
 -TPlan \
 -TPlanState \
+-TPlannerInfo \
 -TPlannerParamItem \
 -TPoint \
 -TPointer \
@@ -982,6 +925,7 @@ do
 -TPrinttupAttrInfo \
 -TPrivGrantee \
 -TPrivTarget \
+-TProcArrayStruct \
 -TProcLangInfo \
 -TProcState \
 -TProcessingMode \
@@ -997,7 +941,6 @@ do
 -TQuerySource \
 -TRC2_KEY \
 -TRC4_KEY \
--TREGEXP \
 -TRIPEMD160_CTX \
 -TRI_QueryHashEntry \
 -TRI_QueryKey \
@@ -1029,14 +972,13 @@ do
 -TReindexStmt \
 -TRelFileNode \
 -TRelIdCacheEnt \
--TRelNameCacheEnt \
 -TRelOptInfo \
 -TRelOptKind \
 -TRelToCheck \
 -TRelToCluster \
 -TRelabelType \
 -TRelation \
--TRelationBuildDescInfo \
+-TRelationAmInfo \
 -TRelationData \
 -TRelationPtr \
 -TRelativeTime \
@@ -1047,7 +989,6 @@ do
 -TRemoveOperStmt \
 -TRenameStmt \
 -TResTarget \
--TResdom \
 -TResolveNew_context \
 -TResourceOwner \
 -TResourceOwnerData \
@@ -1091,10 +1032,6 @@ do
 -TSSL_METHOD \
 -TSSL_SESSION \
 -TSTACK \
--TSTRLEN \
--TSUBLEXINFO \
--TSV \
--TSVOP \
 -TSaveArchivePtr \
 -TScalarArrayOpExpr \
 -TScalarArrayOpExprState \
@@ -1113,6 +1050,10 @@ do
 -TSeqScanState \
 -TSeqTable \
 -TSeqTableData \
+-TSetConstraintState \
+-TSetConstraintStateData \
+-TSetConstraintTrigger \
+-TSetConstraintTriggerData \
 -TSetFunctionReturnMode \
 -TSetOp \
 -TSetOpCmd \
@@ -1122,12 +1063,11 @@ do
 -TSetToDefault \
 -TSharedInvalCatcacheMsg \
 -TSharedInvalRelcacheMsg \
+-TSharedInvalSmgrMsg \
 -TSharedInvalidationMessage \
 -TShmemIndexEnt \
 -TShutdownMode \
 -TSigHandler \
--TSighandler_t \
--TSigsave_t \
 -TSize \
 -TSlruCtl \
 -TSlruCtlData \
@@ -1145,6 +1085,7 @@ do
 -TSortClause \
 -TSortFunctionKind \
 -TSortState \
+-TSplitedPageLayout \
 -TStackElem \
 -TStandardChunkHeader \
 -TStartBlobPtr \
@@ -1159,111 +1100,24 @@ do
 -TSubLinkType \
 -TSubPlan \
 -TSubPlanState \
+-TSubTransactionId \
+-TSubXactCallback \
+-TSubXactCallbackItem \
+-TSubXactEvent \
 -TSubqueryScan \
 -TSubqueryScanState \
 -TSysScanDesc \
 -TSysScanDescData \
 -TTAR_MEMBER \
+-TTBMIterateResult \
+-TTBMStatus \
 -TTBlockState \
+-TTIDBitmap \
 -TTStoreState \
 -TTableDataInfo \
 -TTableInfo \
 -TTargetEntry \
--TTclStubHooks \
--TTclStubs \
--TTcl_AppInitProc \
--TTcl_AsyncHandler \
--TTcl_AsyncProc \
--TTcl_CallFrame \
--TTcl_Channel \
--TTcl_ChannelProc \
--TTcl_ChannelType \
--TTcl_ChannelTypeVersion \
--TTcl_CloseProc \
--TTcl_CmdDeleteProc \
--TTcl_CmdInfo \
--TTcl_CmdProc \
--TTcl_CmdTraceProc \
--TTcl_Command \
--TTcl_Condition \
--TTcl_CreateFileHandlerProc \
--TTcl_DString \
--TTcl_DeleteFileHandlerProc \
--TTcl_DriverBlockModeProc \
--TTcl_DriverClose2Proc \
--TTcl_DriverCloseProc \
--TTcl_DriverFlushProc \
--TTcl_DriverGetHandleProc \
--TTcl_DriverGetOptionProc \
--TTcl_DriverHandlerProc \
--TTcl_DriverInputProc \
--TTcl_DriverOutputProc \
--TTcl_DriverSeekProc \
--TTcl_DriverSetOptionProc \
--TTcl_DriverWatchProc \
--TTcl_DupInternalRepProc \
--TTcl_Encoding \
--TTcl_EncodingConvertProc \
--TTcl_EncodingFreeProc \
--TTcl_EncodingState \
--TTcl_EncodingType \
--TTcl_EolTranslation \
--TTcl_Event \
--TTcl_EventCheckProc \
--TTcl_EventDeleteProc \
--TTcl_EventProc \
--TTcl_EventSetupProc \
--TTcl_ExitProc \
--TTcl_FileFreeProc \
--TTcl_FileProc \
--TTcl_FreeInternalRepProc \
--TTcl_FreeProc \
--TTcl_HashEntry \
--TTcl_HashSearch \
--TTcl_HashTable \
--TTcl_IdleProc \
--TTcl_Interp \
--TTcl_InterpDeleteProc \
--TTcl_MainLoopProc \
--TTcl_MathProc \
--TTcl_Mutex \
--TTcl_Namespace \
--TTcl_NamespaceDeleteProc \
--TTcl_NotifierProcs \
--TTcl_Obj \
--TTcl_ObjCmdProc \
--TTcl_ObjType \
--TTcl_PackageInitProc \
--TTcl_PanicProc \
--TTcl_Parse \
--TTcl_PathType \
--TTcl_Pid \
--TTcl_QueuePosition \
--TTcl_RegExp \
--TTcl_RegExpIndices \
--TTcl_RegExpInfo \
--TTcl_SavedResult \
--TTcl_SetFromAnyProc \
--TTcl_SetTimerProc \
--TTcl_Stat_ \
--TTcl_TcpAcceptProc \
--TTcl_ThreadCreateProc \
--TTcl_ThreadDataKey \
--TTcl_ThreadId \
--TTcl_Time \
--TTcl_TimerProc \
--TTcl_TimerToken \
--TTcl_Token \
--TTcl_Trace \
--TTcl_UniChar \
--TTcl_UpdateStringProc \
--TTcl_Value \
--TTcl_ValueType \
--TTcl_Var \
--TTcl_VarTraceProc \
--TTcl_WaitForEventProc \
 -TThingFile \
--TThread \
 -TTidPath \
 -TTidScan \
 -TTidScanState \
@@ -1307,20 +1161,22 @@ do
 -TTupleTableSlot \
 -TTuplesortstate \
 -TTuplestorestate \
+-TTwoPhaseCallback \
+-TTwoPhaseFileHeader \
+-TTwoPhaseLockRecord \
+-TTwoPhaseRecordOnDisk \
+-TTwoPhaseRmgrId \
+-TTwoPhaseStateData \
 -TType \
 -TTypeCacheEntry \
 -TTypeCast \
+-TTypeFuncClass \
 -TTypeInfo \
 -TTypeName \
--TU16 \
--TU32 \
--TU8 \
 -TUI \
 -TUI_METHOD \
 -TUI_STRING \
 -TUNDO_LIST \
--TUNOP \
--TUV \
 -TUnique \
 -TUniquePath \
 -TUniquePathMethod \
@@ -1356,6 +1212,7 @@ do
 -TVfd \
 -TViewStmt \
 -TWAIT_ORDER \
+-TWorking_State \
 -TWriteBufPtr \
 -TWriteBytePtr \
 -TWriteDataPtr \
@@ -1402,20 +1259,6 @@ do
 -TXLogRelDesc \
 -TXLogwrtResult \
 -TXLogwrtRqst \
--TXPV \
--TXPVAV \
--TXPVBM \
--TXPVCV \
--TXPVFM \
--TXPVGV \
--TXPVHV \
--TXPVIO \
--TXPVIV \
--TXPVLV \
--TXPVMG \
--TXPVNV \
--TXPVUV \
--TXRV \
 -TXactCallback \
 -TXactCallbackItem \
 -TXactEvent \
@@ -1435,11 +1278,12 @@ do
 -Tadjust_inherited_attrs_context \
 -Talc_extra \
 -Talloc_func \
--Tam_extra \
 -Tanyarray \
 -Tassoc_list \
 -Tatc_extra \
 -Tattribute_used_context \
+-Tauth_entry \
+-Tauthmem_entry \
 -TbackslashResult \
 -Tbio_info_cb \
 -Tbitmapword \
@@ -1461,17 +1305,11 @@ do
 -Tchr \
 -Tclock_t \
 -Tclockid_t \
--Tcodes_t \
 -Tcolor \
--Tcomment_t \
 -Tconst_DES_cblock \
 -Tcontain_var_reference_context \
--Tcrc64 \
--Tcv_flags_t \
 -Tdaddr_t \
--Tdate \
 -Tdatetkn \
--Tdecimal \
 -Tdeparse_context \
 -Tdeparse_namespace \
 -Tdev_t \
@@ -1481,11 +1319,9 @@ do
 -Teval_const_expressions_context \
 -TexecRowMark \
 -Texecution_state \
--Texpectation \
 -Tf_smgr \
 -Tfd_mask \
 -Tfd_set \
--Tfilter_t \
 -Tfinalize_primnode_context \
 -Tfind_expr_references_context \
 -Tfind_minimum_var_level_context \
@@ -1498,6 +1334,7 @@ do
 -Tfloat64 \
 -Tfloat64data \
 -Tfloat8 \
+-TfmNodePtr \
 -Tfp_except \
 -Tfp_rnd \
 -Tfpclass_t \
@@ -1507,15 +1344,22 @@ do
 -Tfunc_ptr \
 -Tgenerate_series_fctx \
 -Tgid_t \
+-TgistIncompleteInsert \
+-TgistxlogEntryUpdate \
+-TgistxlogInsertComplete \
+-TgistxlogPage \
+-TgistxlogPageSplit \
 -TgzFile \
 -Thashnode \
 -ThbaPort \
 -Thelp_handler \
 -Tin_addr_t \
 -Tin_port_t \
+-Tindexed_tlist \
 -Tinet \
 -Tinet_struct \
 -Tino_t \
+-Tinstr_time \
 -Tint \
 -Tint16 \
 -Tint16_t \
@@ -1532,7 +1376,6 @@ do
 -Tint8 \
 -Tint8_t \
 -Tint8m_t \
--Tinterval \
 -Tintf \
 -TitemIdSort \
 -TitemIdSortData \
@@ -1542,7 +1385,7 @@ do
 -TlclContext \
 -TlclTocEntry \
 -Tldiv_t \
--Tline_t \
+-TmXactCacheEnt \
 -Tmacaddr \
 -Tmb2wchar_with_len_converter \
 -Tmbdisplaylen_converter \
@@ -1551,22 +1394,18 @@ do
 -Tmode_t \
 -Tnlink_t \
 -Tnls_uint32 \
--Tnumeric \
 -Toff_t \
 -Toidvector \
--Top_tr_array \
--Topcode \
--Topindex \
 -ToptType \
 -Tpcolor \
 -Tpem_password_cb \
--TpgParameterStatus \
--Tpg_conv_map \
+-Tpg_crc32 \
 -Tpg_enc \
 -Tpg_enc2name \
 -Tpg_encname \
 -Tpg_local_to_utf \
 -Tpg_time_t \
+-Tpg_tz \
 -Tpg_utf_to_local \
 -Tpg_wchar \
 -Tpg_wchar_tbl \
@@ -1574,11 +1413,6 @@ do
 -Tpgsql_thing_t \
 -Tpgthreadlock_t \
 -Tpid_t \
--Tplperl_proc_desc \
--Tplpgsql_HashEnt \
--Tplpgsql_yysigned_char \
--Tpltcl_proc_desc \
--Tpltcl_query_desc \
 -Tpqbool \
 -Tpqsigfunc \
 -TprintQueryOpt \
@@ -1595,26 +1429,20 @@ do
 -Tptrdiff_t \
 -Tpull_var_clause_context \
 -Tpull_varnos_context \
--Tpvcontents \
 -Tq128_t \
 -Tqaddr_t \
 -Tquad_t \
 -TrangeTableEntry_used_context \
 -Treduce_outer_joins_state \
--Tregcomp_t \
 -Tregex_t \
--Tregexec_t \
--Tregexp \
 -Tregister_t \
 -Tregmatch_t \
--Tregnode \
 -Tregoff_t \
 -Tregproc \
 -Treplace_vars_with_subplan_refs_context \
 -Trewrite_event \
 -Trm_detail_t \
 -Trune_t \
--Trunops_proc_t \
 -Tsa_family_t \
 -Tsegsz_t \
 -Tsequence_magic \
@@ -1634,17 +1462,14 @@ do
 -Tssize_t \
 -Tssl_crock_st \
 -Tstack_t \
--Tstrconst \
 -Tsubstitute_actual_parameters_context \
--Tsvindex \
--Tsvtype \
 -Tswblk_t \
 -Ttcflag_t \
 -Ttcp_seq \
 -TteReqs \
 -Ttext \
 -Ttime_t \
--Ttimestamp \
+-Ttlist_vinfo \
 -Tts_db_fctx \
 -TuInt \
 -TuIntf \
@@ -1690,18 +1515,28 @@ do
 -Txl_btree_newroot \
 -Txl_btree_split \
 -Txl_btreetid \
+-Txl_dbase_create_rec \
+-Txl_dbase_create_rec_old \
+-Txl_dbase_drop_rec \
+-Txl_dbase_drop_rec_old \
 -Txl_heap_clean \
 -Txl_heap_delete \
 -Txl_heap_header \
 -Txl_heap_insert \
+-Txl_heap_lock \
 -Txl_heap_newpage \
 -Txl_heap_update \
 -Txl_heaptid \
+-Txl_multixact_create \
 -Txl_seq_rec \
 -Txl_smgr_create \
 -Txl_smgr_truncate \
+-Txl_tblspc_create_rec \
+-Txl_tblspc_drop_rec \
 -Txl_xact_abort \
+-Txl_xact_abort_prepared \
 -Txl_xact_commit \
+-Txl_xact_commit_prepared \
 -Tyy_size_t \
 -Tyy_state_type \
 -Tyysigned_char \