That pretty much totally cleans up the includes files here.

src/backend/access/common/indextuple.c

src/backend/access/common/printtup.c

src/backend/access/common/scankey.c

src/backend/access/common/tupdesc.c