diff --git a/src/backend/storage/smgr/bulk_write.c b/src/backend/storage/smgr/bulk_write.c
index 04a76ec5e36..4a10ece4c39 100644
--- a/src/backend/storage/smgr/bulk_write.c
+++ b/src/backend/storage/smgr/bulk_write.c
@@ -57,7 +57,7 @@ typedef struct PendingWrite
 /*
  * Bulk writer state for one relation fork.
  */
-typedef struct BulkWriteState
+struct BulkWriteState
 {
 	/* Information about the target relation we're writing */
 	SMgrRelation smgr;
@@ -75,7 +75,7 @@ typedef struct BulkWriteState
 	XLogRecPtr	start_RedoRecPtr;
 
 	MemoryContext memcxt;
-} BulkWriteState;
+};
 
 static void smgr_bulk_flush(BulkWriteState *bulkstate);
 
diff --git a/src/include/storage/bulk_write.h b/src/include/storage/bulk_write.h
index 6d4532d05e1..cf6f6fcb3f2 100644
--- a/src/include/storage/bulk_write.h
+++ b/src/include/storage/bulk_write.h
@@ -17,6 +17,7 @@
 #include "storage/smgr.h"
 #include "utils/rel.h"
 
+/* Bulk writer state, contents are private to bulk_write.c */
 typedef struct BulkWriteState BulkWriteState;
 
 /*