[evolution-kolab/ek-wip-porting: 32/36] libekolabconv: header include fixes

[Christian Hilberg <chilberg src gnome org>]

commit a7522728a3843a38241b065aa3af807ca4bbc427
Author: Christian Hilberg <hilberg kernelconcepts de>
Date:   Fri Jun 15 14:28:45 2012 +0200

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

 .../main/src/evolution/evolution-util.h            |    4 ++--
 src/libekolabconv/main/src/kolab-conv.c            |    2 +-
 src/libekolabconv/main/src/kolab-conv.h            |    4 ++--
 src/libekolabconv/test/src/testbase.c              |    2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/src/libekolabconv/main/src/evolution/evolution-util.h b/src/libekolabconv/main/src/evolution/evolution-util.h
index 974c678..7be0efc 100644
--- a/src/libekolabconv/main/src/evolution/evolution-util.h
+++ b/src/libekolabconv/main/src/evolution/evolution-util.h
@@ -27,9 +27,9 @@
 #ifndef EVOLUTION_UTIL_H_
 #define EVOLUTION_UTIL_H_
 
-#include <libebook/e-contact.h>
+#include <libebook/libebook.h>
 #include <libical/ical.h>
-#include <libecal/e-cal-component.h>
+#include <libecal/libecal.h>
 #include <time.h>
 #include "../structs/common.h"
 
diff --git a/src/libekolabconv/main/src/kolab-conv.c b/src/libekolabconv/main/src/kolab-conv.c
index 9b2a5ff..241ca89 100644
--- a/src/libekolabconv/main/src/kolab-conv.c
+++ b/src/libekolabconv/main/src/kolab-conv.c
@@ -27,7 +27,7 @@
 
 #include <glib/gi18n-lib.h>
 
-#include <libecal/e-cal-util.h>
+#include <libecal/libecal.h>
 #include "kolab-conv.h"
 #include "evolution/evolution.h"
 #include "kolab/kolab.h"
diff --git a/src/libekolabconv/main/src/kolab-conv.h b/src/libekolabconv/main/src/kolab-conv.h
index af6b161..d45f1c5 100644
--- a/src/libekolabconv/main/src/kolab-conv.h
+++ b/src/libekolabconv/main/src/kolab-conv.h
@@ -30,8 +30,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
-#include <libebook/e-contact.h>
-#include <libecal/e-cal-component.h>
+#include <libebook/libebook.h>
+#include <libecal/libecal.h>
 
 /*
  * some kolab constants
diff --git a/src/libekolabconv/test/src/testbase.c b/src/libekolabconv/test/src/testbase.c
index 0ad23a2..c0e8e37 100644
--- a/src/libekolabconv/test/src/testbase.c
+++ b/src/libekolabconv/test/src/testbase.c
@@ -28,7 +28,7 @@
 #include <stdio.h>
 #include <unistd.h> /* getcwd() definition */
 #include <sys/param.h> /* MAXPATHLEN definition */
-#include <libecal/e-cal-component.h>
+#include <libecal/libecal.h>
 #include <kolab-conv.h>
 #include <evolution/evolution.h>
 #include <kolab/kolab.h>