8 files changed, 8 insertions, 11 deletions
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index 53d58d785d..8c6c98f61f 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -51,7 +51,6 @@ privsolib_LTLIBRARIES = libcal-gui.la
 #	cal-search-bar.c
 # 	cal-search-bar.h
 # 	gnome-cal.c
-# 	gnome-cal.h
 
 libcal_gui_la_SOURCES =		\
 	e-attachment-handler-calendar.c		\
@@ -165,6 +164,7 @@ libcal_gui_la_SOURCES =		\
 	e-timezone-entry.h			\
 	goto.c					\
 	goto.h					\
+	gnome-cal.h				\
 	itip-utils.c				\
 	itip-utils.h				\
 	misc.c					\
diff --git a/calendar/gui/e-cal-list-view.c b/calendar/gui/e-cal-list-view.c
index fc3e85ba34..26edef8bcd 100644
--- a/calendar/gui/e-cal-list-view.c
+++ b/calendar/gui/e-cal-list-view.c
@@ -25,7 +25,7 @@
 #endif
 
 #include "e-cal-list-view.h"
-#include "a11y/ea-calendar.h"
+/*#include "a11y/ea-calendar.h"*/  /* KILL-BONOBO */
 
 #include <math.h>
 #include <time.h>
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index 330bd0eb68..03d6e6991f 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -40,7 +40,6 @@
 #include <shell/e-shell.h>
 
 #include "common/authentication.h"
-#include "calendar-commands.h"
 #include "calendar-config.h"
 #include "comp-util.h"
 #include "e-cal-model-calendar.h"
@@ -55,7 +54,7 @@
 #include "dialogs/select-source-dialog.h"
 #include "print.h"
 #include "goto.h"
-#include "a11y/ea-calendar.h"
+/*#include "a11y/ea-calendar.h"*/  /* KILL-BONOBO */
 #include "e-cal-popup.h"
 #include "misc.h"
 
diff --git a/calendar/gui/e-day-view-main-item.c b/calendar/gui/e-day-view-main-item.c
index c97db277d8..bcd1ca705e 100644
--- a/calendar/gui/e-day-view-main-item.c
+++ b/calendar/gui/e-day-view-main-item.c
@@ -32,7 +32,7 @@
 #include "e-util/e-categories-config.h"
 #include "e-day-view-layout.h"
 #include "e-day-view-main-item.h"
-#include "a11y/ea-calendar.h"
+/*#include "a11y/ea-calendar.h"*/  /* KILL-BONOBO */
 #include "e-calendar-view.h"
 #include "comp-util.h"
 #include <libecal/e-cal-time-util.h>
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index 5ee20f249c..802ddd8f8b 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -26,7 +26,7 @@
 #endif
 
 #include "e-day-view.h"
-#include "a11y/ea-calendar.h"
+/*#include "a11y/ea-calendar.h"*/  /* KILL-BONOBO */
 
 #include <math.h>
 #include <time.h>
diff --git a/calendar/gui/e-week-view-main-item.c b/calendar/gui/e-week-view-main-item.c
index aee26922ea..bfc95ebe2e 100644
--- a/calendar/gui/e-week-view-main-item.c
+++ b/calendar/gui/e-week-view-main-item.c
@@ -29,7 +29,7 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 #include "e-week-view-main-item.h"
-#include "a11y/ea-calendar.h"
+/*#include "a11y/ea-calendar.h"*/  /* KILL-BONOBO */
 
 static void e_week_view_main_item_set_property	(GObject	 *object,
 						 guint		  property_id,
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index c939d280de..1e84aeaea3 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -30,7 +30,7 @@
 #endif
 
 #include "e-week-view.h"
-#include "a11y/ea-calendar.h"
+/*#include "a11y/ea-calendar.h"*/  /* KILL-BONOBO */
 
 #include <math.h>
 #include <gdk/gdkkeysyms.h>
diff --git a/calendar/gui/print.h b/calendar/gui/print.h
index 39482b33f2..39d5608222 100644
--- a/calendar/gui/print.h
+++ b/calendar/gui/print.h
@@ -25,9 +25,7 @@
 #ifndef PRINT_H
 #define PRINT_H
 
-#include "gnome-cal.h"
-
-
+#include "calendar/gui/gnome-cal.h"
 
 typedef enum {
 	PRINT_VIEW_DAY,