diff --git a/src/backend/libpq/auth-scram.c b/src/backend/libpq/auth-scram.c
index db778405724..e343ffea46f 100644
--- a/src/backend/libpq/auth-scram.c
+++ b/src/backend/libpq/auth-scram.c
@@ -134,8 +134,6 @@ typedef struct
 {
 	scram_state_enum state;
 
-	const char *username;		/* username from startup packet */
-
 	Port	   *port;
 	bool		channel_binding_in_use;
 
diff --git a/src/backend/storage/aio/method_worker.c b/src/backend/storage/aio/method_worker.c
index b5ac073a910..866a35abbd1 100644
--- a/src/backend/storage/aio/method_worker.c
+++ b/src/backend/storage/aio/method_worker.c
@@ -55,7 +55,6 @@
 typedef struct PgAioWorkerSubmissionQueue
 {
 	uint32		size;
-	uint32		mask;
 	uint32		head;
 	uint32		tail;
 	int			sqes[FLEXIBLE_ARRAY_MEMBER];
diff --git a/src/backend/utils/sort/sharedtuplestore.c b/src/backend/utils/sort/sharedtuplestore.c
index 2f031c32909..1dedbaa29cf 100644
--- a/src/backend/utils/sort/sharedtuplestore.c
+++ b/src/backend/utils/sort/sharedtuplestore.c
@@ -88,7 +88,6 @@ struct SharedTuplestoreAccessor
 	/* State for writing. */
 	SharedTuplestoreChunk *write_chunk; /* Buffer for writing. */
 	BufFile    *write_file;		/* The current file to write to. */
-	BlockNumber write_page;		/* The next page to write to. */
 	char	   *write_pointer;	/* Current write pointer within chunk. */
 	char	   *write_end;		/* One past the end of the current chunk. */
 };