diff -up evolution-2.21.2/shell/es-event.c.invalid-include evolution-2.21.2/shell/es-event.c
--- evolution-2.21.2/shell/es-event.c.invalid-include	2007-10-28 22:02:14.000000000 -0400
+++ evolution-2.21.2/shell/es-event.c	2007-11-29 15:01:31.000000000 -0500
@@ -30,6 +30,7 @@
 #include <glib.h>
 
 #include "es-event.h"
+#include "e-shell.h"
 
 static GObjectClass *eme_parent;
 static ESEvent *es_event;
diff -up evolution-2.21.2/shell/es-event.h.invalid-include evolution-2.21.2/shell/es-event.h
--- evolution-2.21.2/shell/es-event.h.invalid-include	2007-10-23 06:03:16.000000000 -0400
+++ evolution-2.21.2/shell/es-event.h	2007-11-29 15:01:31.000000000 -0500
@@ -26,13 +26,14 @@
 #include <glib-object.h>
 
 #include "e-util/e-event.h"
-#include "e-shell.h"
 
 #ifdef __cplusplus
 extern "C" {
 #pragma }
 #endif /* __cplusplus */
 
+struct _EShell;  /* Avoid including "e-shell.h" */
+
 typedef struct _ESEvent ESEvent;
 typedef struct _ESEventClass ESEventClass;
 
@@ -56,7 +57,7 @@ typedef struct _ESEventTargetShell ESEve
 struct _ESEventTargetShell {
 	EEventTarget target;
 
-	EShell *shell;
+	struct _EShell *shell;
 };
 
 struct _ESEventTargetState {
@@ -91,7 +92,7 @@ GType es_event_get_type(void);
 ESEvent *es_event_peek(void);
 
 ESEventTargetState *es_event_target_new_state(ESEvent *emp, int state);
-ESEventTargetShell *es_event_target_new_shell(ESEvent *eme, EShell *shell);
+ESEventTargetShell *es_event_target_new_shell(ESEvent *eme, struct _EShell *shell);
 ESEventTargetUpgrade *es_event_target_new_upgrade(ESEvent *emp, int major, int minor, int revision);
 
 /* ********************************************************************** */