--- icalss.h	2010-05-25 13:35:13.185951789 +0200
+++ /usr/include/libical/icalss.h	2010-05-23 18:39:15.000000000 +0200
@@ -3,14 +3,15 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+/*
+ $Id$
+*/
 /* -*- Mode: C -*- */
 /*======================================================================
  FILE: icalgauge.h
  CREATOR: eric 23 December 1999
 
 
- $Id: icalgauge.h,v 1.6 2008-01-02 20:07:40 dothebart Exp $
- $Locker:  $
 
  (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
 
@@ -34,7 +35,7 @@
 #ifndef ICALGAUGE_H
 #define ICALGAUGE_H
 
-
+#include <icalcomponent.h>
 
 /** @file icalgauge.h
  *  @brief Routines implementing a filter for ical components
@@ -82,8 +83,6 @@
 **/
 
 /*
- $Id: icalset.h,v 1.15 2008-01-02 20:07:42 dothebart Exp $
- $Locker:  $
 
  (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
 
@@ -109,7 +108,7 @@
 
 #include <limits.h> /* For PATH_MAX */
 #include <libical/ical.h>
-
+#include <icalgauge.h>
 
 #ifdef PATH_MAX
 #define ICAL_PATH_MAX PATH_MAX
@@ -256,8 +255,6 @@
  CREATOR: eric 23 December 1999
 
 
- $Id: icalcluster.h,v 1.4 2008-01-02 20:07:40 dothebart Exp $
- $Locker:  $
 
  (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
 
@@ -282,7 +279,7 @@
 #define ICALCLUSTER_H
 
 #include <libical/ical.h>
-
+#include <icalset.h>
 
 typedef struct icalcluster_impl icalcluster;
 
@@ -317,8 +314,6 @@
  CREATOR: eric 23 December 1999
 
 
- $Id: icalfileset.h,v 1.15 2008-01-02 20:07:40 dothebart Exp $
- $Locker:  $
 
  (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
 
@@ -343,7 +338,9 @@
 #define ICALFILESET_H
 
 #include <libical/ical.h>
-
+#include <icalset.h>
+#include <icalcluster.h>
+#include <icalgauge.h>
 #include <sys/types.h> /* For open() flags and mode */
 #include <sys/stat.h> /* For open() flags and mode */
 #include <fcntl.h> /* For open() flags and mode */
@@ -449,8 +446,6 @@
  CREATOR: eric 28 November 1999
 
 
- $Id: icaldirset.h,v 1.8 2008-01-02 20:07:40 dothebart Exp $
- $Locker:  $
 
  (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
 
@@ -475,7 +470,9 @@
 #define ICALDIRSET_H
 
 #include <libical/ical.h>
-
+#include <icalset.h>
+#include <icalcluster.h>
+#include <icalgauge.h>
 
 /* icaldirset Routines for storing, fetching, and searching for ical
  * objects in a database */
@@ -545,8 +542,6 @@
  CREATOR: eric 23 December 1999
 
 
- $Id: icalcalendar.h,v 1.4 2008-01-02 20:07:39 dothebart Exp $
- $Locker:  $
 
  (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
 
@@ -571,7 +566,7 @@
 #define ICALCALENDAR_H
 
 #include <libical/ical.h>
-
+#include <icalset.h>
 
 /* icalcalendar
  * Routines for storing calendar data in a file system. The calendar 
@@ -612,8 +607,6 @@
  CREATOR: eric 21 Aug 2000
 
 
- $Id: icalclassify.h,v 1.7 2008-01-15 23:17:43 dothebart Exp $
- $Locker:  $
 
  (C) COPYRIGHT 2000, Eric Busboom <eric@softwarestudio.org>
      http://www.softwarestudio.org
@@ -636,7 +629,8 @@
 #define ICALCLASSIFY_H
 
 #include <libical/ical.h>
-
+#include <icalset.h>
+#include <icalcomponent.h>
 
 icalproperty_xlicclass icalclassify(icalcomponent* c,icalcomponent* match, 
 			      const char* user);
@@ -658,8 +652,6 @@
  CREATOR: eric 21 Aug 2000
 
 
- $Id: icalspanlist.h,v 1.8 2008-01-02 20:07:42 dothebart Exp $
- $Locker:  $
 
  (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
 
@@ -680,7 +672,7 @@
 #define ICALSPANLIST_H
 
 #include <libical/ical.h>
-
+#include <icalset.h>
 
 /** @file icalspanlist.h
  *  @brief Code that supports collections of free/busy spans of time
@@ -735,8 +727,6 @@
  CREATOR: eric 07 Nov 2000
 
 
- $Id: icalmessage.h,v 1.3 2008-01-02 20:07:41 dothebart Exp $
- $Locker:  $
 
  (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
 
@@ -800,7 +790,6 @@
 
 
 #endif /* ICALMESSAGE_H*/
-
 #ifdef __cplusplus
 }
 #endif