diff -ru evolution-2.3.1.orig/composer/e-msg-composer.h evolution-2.3.1/composer/e-msg-composer.h
--- evolution-2.3.1.orig/composer/e-msg-composer.h	2005-04-26 06:55:41.000000000 -0700
+++ evolution-2.3.1/composer/e-msg-composer.h	2005-04-26 06:55:41.000000000 -0700
@@ -33,7 +33,7 @@
 
 #include "e-msg-composer-attachment-bar.h"
 #include "e-msg-composer-hdrs.h"
-#include "Editor.h"
+#include "composer/Editor.h"
 
 #ifdef __cplusplus
 extern "C" {
diff -ru evolution-2.3.1.orig/plugins/calendar-weather/Makefile.am evolution-2.3.1/plugins/calendar-weather/Makefile.am
--- evolution-2.3.1.orig/plugins/calendar-weather/Makefile.am	2005-04-26 06:55:41.000000000 -0700
+++ evolution-2.3.1/plugins/calendar-weather/Makefile.am	2005-04-26 06:55:41.000000000 -0700
@@ -2,7 +2,9 @@
 weatherdatadir = $(datadir)/evolution/$(BASE_VERSION)/weather
 
 INCLUDES =									\
+	-I$(top_srcdir)								\
 	-I$(top_srcdir)/shell							\
+	-I$(top_builddir)/shell							\
 	$(EVOLUTION_CFLAGS)							\
 	$(EVOLUTION_CALENDAR_CFLAGS)						\
 	$(SOURCE_SEL_CFLAGS)							\
