--- conversion/commonconversion.h	2012-05-02 07:56:08.000000000 -0400
+++ conversion/commonconversion.h	2012-07-02 23:04:24.762660720 -0400
@@ -20,7 +20,7 @@
 
 #include <KDE/KDateTime>
 #include <QStringList>
-#include <kolab/kolabcontainers.h>
+#include <kolabcontainers.h>
 
 
 namespace Kolab {
@@ -32,4 +32,4 @@
     };
 };
 
-#endif
\ No newline at end of file
+#endif
--- conversion/kabcconversion.h	2012-05-02 07:56:08.000000000 -0400
+++ conversion/kabcconversion.h	2012-07-02 23:04:24.762660720 -0400
@@ -20,7 +20,7 @@
 
 #include "kolab_export.h"
 
-#include <kolab/kolabcontact.h>
+#include <kolabcontact.h>
 #include <kabc/addressee.h>
 #include <kabc/contactgroup.h>
 
@@ -40,4 +40,4 @@
     };
 };
 
-#endif
\ No newline at end of file
+#endif
--- conversion/kcalconversion.h	2012-05-02 07:56:08.000000000 -0400
+++ conversion/kcalconversion.h	2012-07-02 23:04:24.763660720 -0400
@@ -20,9 +20,9 @@
 
 #include "kolab_export.h"
 
-#include <kolab/kolabevent.h>
-#include <kolab/kolabtodo.h>
-#include <kolab/kolabjournal.h>
+#include <kolabevent.h>
+#include <kolabtodo.h>
+#include <kolabjournal.h>
 #include <kcalcore/event.h>
 #include <kcalcore/todo.h>
 #include <kcalcore/journal.h>
@@ -49,4 +49,4 @@
     };
 };
 
-#endif
\ No newline at end of file
+#endif
--- conversion/kolabconversion.h	2012-05-02 07:56:08.000000000 -0400
+++ conversion/kolabconversion.h	2012-07-02 23:04:24.764660720 -0400
@@ -20,7 +20,7 @@
 
 #include "kolab_export.h"
 
-#include <kolab/kolabnote.h>
+#include <kolabnote.h>
 #include <kmime/kmime_message.h>
 
 namespace Kolab {
@@ -36,4 +36,4 @@
     };
 };
 
-#endif
\ No newline at end of file
+#endif
--- kolabformat/errorhandler.cpp	2012-05-02 07:56:08.000000000 -0400
+++ kolabformat/errorhandler.cpp	2012-07-02 23:04:24.764660720 -0400
@@ -20,7 +20,7 @@
 
 #include <qdebug.h>
 
-#include <kolab/kolabformat.h>
+#include <kolabformat.h>
 
 namespace Kolab {
     
--- kolabformat/kolabobject.cpp	2012-05-02 07:56:08.000000000 -0400
+++ kolabformat/kolabobject.cpp	2012-07-02 23:04:24.765660720 -0400
@@ -34,7 +34,7 @@
 #include <conversion/kabcconversion.h>
 #include <conversion/kolabconversion.h>
 #include <akonadi/notes/noteutils.h>
-#include <kolab/kolabformat.h>
+#include <kolabformat.h>
 
 
 namespace Kolab {
--- tests/benchmark.cpp	2012-05-02 07:56:08.000000000 -0400
+++ tests/benchmark.cpp	2012-07-02 23:05:22.746664944 -0400
@@ -19,7 +19,7 @@
 #include "kolabformatV2/event.h"
 #include "conversion/kcalconversion.h"
 #include <kmime/kmime_message.h>
-#include <kolab/kolabformat.h>
+#include <kolabformat.h>
 #include <kdebug.h>
 #include "testutils.h"
 
--- tests/formattest.cpp	2012-05-02 07:56:08.000000000 -0400
+++ tests/formattest.cpp	2012-07-02 23:05:34.920665858 -0400
@@ -26,8 +26,8 @@
 #include <qtemporaryfile.h>
 #include <QBuffer>
 #include <kdebug.h>
-#include <kolab/kolabcontainers.h>
-#include <kolab/kolabformat.h>
+#include <kolabcontainers.h>
+#include <kolabformat.h>
 
 #include <kcalcore/icalformat.h>
 #include <kabc/vcardconverter.h>
--- tests/kcalconversiontest.cpp	2012-05-02 07:56:08.000000000 -0400
+++ tests/kcalconversiontest.cpp	2012-07-02 23:05:46.269666653 -0400
@@ -4,7 +4,7 @@
 #include <QtCore/QObject>
 #include <QtTest/QtTest>
 #include <KDE/KSystemTimeZones>
-#include <kolab/kolabcontact.h>
+#include <kolabcontact.h>
 #include <kcalcore/recurrence.h>
 #include <kabc/addressee.h>
 
--- tests/upgradetest.cpp	2012-05-02 07:56:08.000000000 -0400
+++ tests/upgradetest.cpp	2012-07-02 23:06:03.269667875 -0400
@@ -19,8 +19,8 @@
 #include "upgradetest.h"
 
 #include <QTest>
-#include <kolab/kolabcontainers.h>
-#include <kolab/kolabformat.h>
+#include <kolabcontainers.h>
+#include <kolabformat.h>
 
 #include "testutils.h"
 #include "kolabformat/kolabobject.h"