diff -ru evolution-2.1.3.2.orig/composer/e-msg-composer.h evolution-2.1.3.2/composer/e-msg-composer.h
--- evolution-2.1.3.2.orig/composer/e-msg-composer.h	2004-07-27 09:52:17.000000000 -0700
+++ evolution-2.1.3.2/composer/e-msg-composer.h	2005-01-14 16:21:16.000000000 -0800
@@ -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.1.3.2.orig/plugins/calendar-weather/Makefile.am evolution-2.1.3.2/plugins/calendar-weather/Makefile.am
--- evolution-2.1.3.2.orig/plugins/calendar-weather/Makefile.am	2005-01-07 08:28:15.000000000 -0800
+++ evolution-2.1.3.2/plugins/calendar-weather/Makefile.am	2005-01-14 16:14:37.000000000 -0800
@@ -1,7 +1,9 @@
 eds_datadir = `pkg-config --variable=privdatadir evolution-data-server-1.2`
 
 INCLUDES =									\
+	-I$(top_srcdir)								\
 	-I$(top_srcdir)/shell							\
+	-I$(top_builddir)/shell							\
 	$(EVOLUTION_CFLAGS)							\
 	$(EVOLUTION_CALENDAR_CFLAGS)						\
 	$(SOURCE_SEL_CFLAGS)							\
