--- a/window.h	Wed Nov 09 11:32:15 2005 +0000
+++ b/window.h	Thu Nov 10 15:23:55 2005 +0000
@@ -272,11 +272,11 @@
 	uint step_height;
 } ResizeInfo;
 
-typedef struct Message {
+typedef struct WindowMessage {
 		int msg;
 		int wparam;
 		int lparam;
-} Message;
+} WindowMessage;
 
 struct Window {
 	uint16 flags4;
@@ -298,7 +298,7 @@
  	Widget *widget;
 	uint32 desc_flags;
 
-	Message message;
+	WindowMessage message;
 	byte custom[WINDOW_CUSTOM_SIZE];
 };