[evolution-kolab/ek-wip-porting: 33/36] libekolabutil: header include fixes

[Christian Hilberg <chilberg src gnome org>]

commit d0d44a0331bdd114ba626332d2dc23600e9e26df
Author: Christian Hilberg <hilberg kernelconcepts de>
Date:   Fri Jun 15 14:31:12 2012 +0200

    libekolabutil: header include fixes
    
    * Evo/E-D-S now enforce inclusion of only one
      header file for their libs

 src/libekolabutil/kolab-util-cal-freebusy.c |    1 -
 src/libekolabutil/kolab-util-cal-freebusy.h |    8 ++++----
 src/libekolabutil/kolab-util-camel.c        |    2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/src/libekolabutil/kolab-util-cal-freebusy.c b/src/libekolabutil/kolab-util-cal-freebusy.c
index 666485a..58181b8 100644
--- a/src/libekolabutil/kolab-util-cal-freebusy.c
+++ b/src/libekolabutil/kolab-util-cal-freebusy.c
@@ -43,7 +43,6 @@
 /*----------------------------------------------------------------------------*/
 
 #include <libical/icalvcal.h>
-#include <libecal/e-cal-util.h>
 
 #include "camel-system-headers.h"
 #include "kolab-util-cal-freebusy.h"
diff --git a/src/libekolabutil/kolab-util-cal-freebusy.h b/src/libekolabutil/kolab-util-cal-freebusy.h
index 44a88ef..12ebffd 100644
--- a/src/libekolabutil/kolab-util-cal-freebusy.h
+++ b/src/libekolabutil/kolab-util-cal-freebusy.h
@@ -12,17 +12,17 @@
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301,  USA
  */
- 
+
 /*----------------------------------------------------------------------------*/
 
 #ifndef _KOLAB_UTIL_CAL_FREEBUSY_H_
@@ -32,7 +32,7 @@
 
 #include <glib.h>
 
-#include <libecal/e-cal-component.h>
+#include <libecal/libecal.h>
 
 #include <libekolabconv/main/src/kolab-conv.h>
 
diff --git a/src/libekolabutil/kolab-util-camel.c b/src/libekolabutil/kolab-util-camel.c
index 131bcf4..ebc789c 100644
--- a/src/libekolabutil/kolab-util-camel.c
+++ b/src/libekolabutil/kolab-util-camel.c
@@ -29,7 +29,7 @@
 
 #include <glib/gi18n-lib.h>
 
-#include <libedataserver/e-data-server-util.h>
+#include <libedataserver/libedataserver.h>
 
 #include "kolab-util-error.h"
 #include "kolab-util-glib.h"