diff --git a/src/tools/find_typedef b/src/tools/find_typedef
index 22239c659d..ff575fefa5 100755
--- a/src/tools/find_typedef
+++ b/src/tools/find_typedef
@@ -28,4 +28,7 @@ do
 done |
 sort |
 uniq |
+# these are used both for typedefs and variable names
+# so do not include them
+egrep -v '^(date|interval|timestamp|ANY)$' |
 sed 's/\(.*\)/-T\1 \\/'
diff --git a/src/tools/pgindent/pgindent b/src/tools/pgindent/pgindent
index c9e02c3600..887189ead6 100755
--- a/src/tools/pgindent/pgindent
+++ b/src/tools/pgindent/pgindent
@@ -109,7 +109,6 @@ do
 -TAES_KEY \
 -TAMT \
 -TAMTS \
--TANY \
 -TASN1_BIT_STRING \
 -TASN1_BMPSTRING \
 -TASN1_BOOLEAN \
@@ -1548,7 +1547,6 @@ do
 -Tcontain_var_reference_context \
 -Tcv_flags_t \
 -Tdaddr_t \
--Tdate \
 -Tdatetkn \
 -Tdecimal \
 -Tdeparse_context \
@@ -1620,7 +1618,6 @@ do
 -Tint8 \
 -Tint8_t \
 -Tint8m_t \
--Tinterval \
 -Tintf \
 -TitemIdSort \
 -TitemIdSortData \
@@ -1737,7 +1734,6 @@ do
 -TteReqs \
 -Ttext \
 -Ttime_t \
--Ttimestamp \
 -Ttlist_vinfo \
 -Tts_db_fctx \
 -TuInt \