diff --git a/textio/txcommands.h b/textio/txcommands.h
index cfb533c4..0f954d6c 100644
--- a/textio/txcommands.h
+++ b/textio/txcommands.h
@@ -38,7 +38,7 @@
 #define	TX_MAXARGS	200
 #define TX_MAX_CMDLEN	2048
 
-typedef struct {		/* A command -- either a button push or
+typedef struct TX_CMD_S {	/* A command -- either a button push or
 				 * a textual command.
 				 */
     Point tx_p;			/* The location of the pointing device
diff --git a/windows/windows.h b/windows/windows.h
index faa6ce04..8d215b79 100644
--- a/windows/windows.h
+++ b/windows/windows.h
@@ -251,6 +251,7 @@ extern void WindOutToIn();
 extern void WindInToOut();
 extern void WindSetWindowAreas(MagWindow *);
 extern void windFixSurfaceArea();
+typedef struct TX_CMD_S TxCommand;	/* Forward declaration; defined in textio/txcommands.h */
 extern int WindExecute(MagWindow *, WindClient, TxCommand *);
 extern void WindAddCommand(WindClient, char *, void (*)(), bool);
 extern int WindReplaceCommand();