Index: akonadi/libs/tests/notificationmessagetest.cpp
===================================================================
--- akonadi/libs/tests/notificationmessagetest.cpp	(revision 1106878)
+++ akonadi/libs/tests/notificationmessagetest.cpp	(working copy)
@@ -22,7 +22,7 @@

 #include <notificationmessage_p.h>

-#include <QtTest>
+#include <QtTest/QTest>

 QTEST_APPLESS_MAIN( NotificationMessageTest )

Index: akonadi/server/control/controlmanager.cpp
===================================================================
--- akonadi/server/control/controlmanager.cpp	(revision 1106878)
+++ akonadi/server/control/controlmanager.cpp	(working copy)
@@ -17,13 +17,13 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/

+#include "controlmanager.h"
+
 #include <QtCore/QCoreApplication>
 #include <QtCore/QTimer>

 #include "controlmanageradaptor.h"

-#include "controlmanager.h"
-
 ControlManager::ControlManager( QObject *parent )
   : QObject( parent )
 {
Index: akonadi/server/tests/unittest/imapstreamparsertest.h
===================================================================
--- akonadi/server/tests/unittest/imapstreamparsertest.h	(revision 1106878)
+++ akonadi/server/tests/unittest/imapstreamparsertest.h	(working copy)
@@ -18,8 +18,8 @@
     02110-1301, USA.
 */

-#ifndef IMAPPARSER_TEST_H
-#define IMAPPARSER_TEST_H
+#ifndef IMAPSTREAMPARSERTEST_H
+#define IMAPSTREAMPARSERTEST_H

 #include <QtCore/QObject>
 #include <QtTest/QtTest>
Index: akonadi/server/tests/unittest/scopetest.cpp
===================================================================
--- akonadi/server/tests/unittest/scopetest.cpp	(revision 1106878)
+++ akonadi/server/tests/unittest/scopetest.cpp	(working copy)
@@ -18,7 +18,8 @@
 */

 #include <QObject>
-#include <QtTest>
+#include <QtTest/QTest>
+#include <QtCore/QBuffer>

 #include "handler/scope.cpp"
 #include "imapstreamparser.h"
Index: akonadi/server/tests/unittest/handlerhelpertest.cpp
===================================================================
--- akonadi/server/tests/unittest/handlerhelpertest.cpp	(revision 1106878)
+++ akonadi/server/tests/unittest/handlerhelpertest.cpp	(working copy)
@@ -18,7 +18,7 @@
 */

 #include <QObject>
-#include <QtTest>
+#include <QtTest/QTest>

 #include "handlerhelper.cpp"

Index: akonadi/server/shared/akapplication.cpp
===================================================================
--- akonadi/server/shared/akapplication.cpp	(revision 1106878)
+++ akonadi/server/shared/akapplication.cpp	(working copy)
@@ -19,7 +19,7 @@

 #include "akapplication.h"
 #include "akdebug.h"
-#include "config-akonadi.h"
+#include <config-akonadi.h>

 #include <QDBusConnection>
 #include <QTimer>
Index: akonadi/server/src/preprocessorinstance.h
===================================================================
--- akonadi/server/src/preprocessorinstance.h	(revision 1106878)
+++ akonadi/server/src/preprocessorinstance.h	(working copy)
@@ -22,8 +22,8 @@
  *
  *****************************************************************************/

-#ifndef _PREPROCESSORINSTANCE_H_
-#define _PREPROCESSORINSTANCE_H_
+#ifndef AKONADI_PREPROCESSORINSTANCE_H
+#define AKONADI_PREPROCESSORINSTANCE_H

 #include <QtCore/QObject>
 #include <QtCore/QList>
Index: akonadi/server/src/storage/itemretrievalthread.h
===================================================================
--- akonadi/server/src/storage/itemretrievalthread.h	(revision 1106878)
+++ akonadi/server/src/storage/itemretrievalthread.h	(working copy)
@@ -17,8 +17,8 @@
     02110-1301, USA.
 */

-#ifndef AKONADI_ITEMRETRIEVERTHREAD_H
-#define AKONADI_ITEMRETRIEVERTHREAD_H
+#ifndef AKONADI_ITEMRETRIEVALTHREAD_H
+#define AKONADI_ITEMRETRIEVALTHREAD_H

 #include "itemretriever.h"

Index: akonadi/server/src/storage/itemretrievalmanager.h
===================================================================
--- akonadi/server/src/storage/itemretrievalmanager.h	(revision 1106878)
+++ akonadi/server/src/storage/itemretrievalmanager.h	(working copy)
@@ -17,8 +17,8 @@
     02110-1301, USA.
 */

-#ifndef AKONADI_ITEMRETRIEVERMANAGER_H
-#define AKONADI_ITEMRETRIEVERMANAGER_H
+#ifndef AKONADI_ITEMRETRIEVALMANAGER_H
+#define AKONADI_ITEMRETRIEVALMANAGER_H

 #include "itemretriever.h"

Index: akonadi/server/src/search/dbusoperators.h
===================================================================
--- akonadi/server/src/search/dbusoperators.h	(revision 1106878)
+++ akonadi/server/src/search/dbusoperators.h	(working copy)
@@ -16,8 +16,8 @@
    Boston, MA 02110-1301, USA.
 */

-#ifndef _NEPOMUK_SEARCH_DBUS_OPERATORS_H_
-#define _NEPOMUK_SEARCH_DBUS_OPERATORS_H_
+#ifndef AKONADI_DBUSOPERATORS_H
+#define AKONADI_DBUSOPERATORS_H

 #include <QtDBus/QDBusArgument>

Index: akonadi/server/src/search/querymetatype.h
===================================================================
--- akonadi/server/src/search/querymetatype.h	(revision 1106878)
+++ akonadi/server/src/search/querymetatype.h	(working copy)
@@ -21,8 +21,8 @@
  * into the service interface when generated via qdbusxml2cpp.
  */

-#ifndef _NEPOMUK_QUERY_META_TYPE_H_
-#define _NEPOMUK_QUERY_META_TYPE_H_
+#ifndef AKONADI_QUERYMETATYPE_H
+#define AKONADI_QUERYMETATYPE_H

 typedef QHash<QString, QString> RequestPropertyMapDBus;
 Q_DECLARE_METATYPE( RequestPropertyMapDBus )
Index: akonadi/server/src/search/result.h
===================================================================
--- akonadi/server/src/search/result.h	(revision 1106878)
+++ akonadi/server/src/search/result.h	(working copy)
@@ -17,8 +17,8 @@
    Boston, MA 02110-1301, USA.
  */

-#ifndef _NEPOMUK_SEARCH_RESULT_H_
-#define _NEPOMUK_SEARCH_RESULT_H_
+#ifndef AKONADI_RESULT_H
+#define AKONADI_RESULT_H

 #include <QtCore/QSharedDataPointer>
 #include <QtCore/QUrl>
Index: akonadi/server/src/search/queryserviceclient.h
===================================================================
--- akonadi/server/src/search/queryserviceclient.h	(revision 1106878)
+++ akonadi/server/src/search/queryserviceclient.h	(working copy)
@@ -16,8 +16,8 @@
    Boston, MA 02110-1301, USA.
 */

-#ifndef _NEPOMUK_QUERY_SERVICE_CLIENT_H_
-#define _NEPOMUK_QUERY_SERVICE_CLIENT_H_
+#ifndef AKONADI_QUERYSERVICECLIENT_H
+#define AKONADI_QUERYSERVICECLIENT_H

 #include <QtCore/QObject>

Index: akonadi/server/src/preprocessormanager.h
===================================================================
--- akonadi/server/src/preprocessormanager.h	(revision 1106878)
+++ akonadi/server/src/preprocessormanager.h	(working copy)
@@ -22,8 +22,8 @@
  *
  *****************************************************************************/

-#ifndef _PREPROCESSORMANAGER_H_
-#define _PREPROCESSORMANAGER_H_
+#ifndef AKONADI_PREPROCESSORMANAGER_H
+#define AKONADI_PREPROCESSORMANAGER_H

 #include <QtCore/QObject>
 #include <QtCore/QList>
Index: akonadi/server/src/handler/akappend.cpp
===================================================================
--- akonadi/server/src/handler/akappend.cpp	(revision 1106878)
+++ akonadi/server/src/handler/akappend.cpp	(working copy)
@@ -17,11 +17,12 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/

+#include "akappend.h"
+
 #include "libs/imapparser_p.h"
 #include "imapstreamparser.h"

 #include "append.h"
-#include "akappend.h"
 #include "response.h"
 #include "handlerhelper.h"

Index: akonadi/server/src/nepomuksearch.cpp
===================================================================
--- akonadi/server/src/nepomuksearch.cpp	(revision 1106878)
+++ akonadi/server/src/nepomuksearch.cpp	(working copy)
@@ -17,12 +17,12 @@
     02110-1301, USA.
 */

+#include "nepomuksearch.h"
+
 #include <QtCore/QDebug>
 #include <QtCore/QStringList>
 #include <QtCore/QUrl>

-#include "nepomuksearch.h"
-
 #include "search/result.h"

 using namespace Akonadi;
Index: akonadi/server/src/nepomukmanager.cpp
===================================================================
--- akonadi/server/src/nepomukmanager.cpp	(revision 1106878)
+++ akonadi/server/src/nepomukmanager.cpp	(working copy)
@@ -17,12 +17,12 @@
     02110-1301, USA.
 */

+#include "nepomukmanager.h"
+
 #include <QtCore/QDebug>
 #include <QtCore/QUrl>
 #include <QMetaObject>

-#include "nepomukmanager.h"
-
 #include "search/result.h"

 #include "entities.h"