diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 9d12dea57c..4344ce59f8 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,9 @@
+2005-01-31  Hans Petter Jansson  <hpj@novell.com>
+
+	* idl/evolution-calendar.idl: Remove definition of CalObjUID and
+	include that from Evolution-DataServer-Calendar.idl instead. This
+	prevents the typecode from being defined twice.
+
 2005-01-31  Hans Petter Jansson  <hpj@novell.com>
 
 	* gui/e-cal-config.c (_ECalConfigPrivate): Use guint instead of ulong
diff --git a/calendar/idl/evolution-calendar.idl b/calendar/idl/evolution-calendar.idl
index 532fa2a0e4..48f7281ab3 100644
--- a/calendar/idl/evolution-calendar.idl
+++ b/calendar/idl/evolution-calendar.idl
@@ -12,14 +12,12 @@
 #define _EVOLUTION_CALENDAR_IDL_
 
 #include <Bonobo.idl>
+#include <Evolution-DataServer-Calendar.idl>
 
 module GNOME {
 module Evolution {
 
 module Calendar {
-	/* A unique identifier for a calendar component */
-	typedef string CalObjUID;
-
 	/* Factory to centralize calendar component editor dialogs */
 	interface CompEditorFactory : Bonobo::Unknown {
 		exception InvalidURI {};