diff --git a/akonadi/entity.h b/akonadi/entity.h
index d333bbd07..7b6c66e7b 100644
--- a/akonadi/entity.h
+++ b/akonadi/entity.h
@@ -1,234 +1,234 @@
 /*
     Copyright (c) 2008 Tobias Koenig <tokoe@kde.org>
 
     This library is free software; you can redistribute it and/or modify it
     under the terms of the GNU Library General Public License as published by
     the Free Software Foundation; either version 2 of the License, or (at your
     option) any later version.
 
     This library 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 Library General Public
     License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to the
     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
     02110-1301, USA.
 */
 
 #ifndef AKONADI_ENTITY_H
 #define AKONADI_ENTITY_H
 
 #include "akonadi_export.h"
 
 namespace Akonadi {
 class Entity;
 }
 
 AKONADI_EXPORT uint qHash( const Akonadi::Entity& );
 
 #include <akonadi/attribute.h>
 
-#include <KDebug>
+#include <KDE/KDebug>
 
 #include <QtCore/QHash>
 #include <QtCore/QSharedDataPointer>
 
 #define AKONADI_DECLARE_PRIVATE( Class ) \
     Class##Private* d_func(); \
     const Class##Private* d_func() const; \
     friend class Class##Private;
 
 namespace Akonadi {
 
 class EntityPrivate;
 
 /**
  * @short The base class for Item and Collection.
  *
  * Entity is the common base class for Item and Collection that provides
  * unique IDs and attributes handling.
  *
  * This class is not meant to be used directly, use Item or Collection instead.
  *
  * @author Tobias Koenig <tokoe@kde.org>
  */
 class AKONADI_EXPORT Entity
 {
   public:
     /**
      * Describes the unique id type.
      */
     typedef qint64 Id;
 
     /**
      * Destroys the entity.
      */
     ~Entity();
 
     /**
      * Sets the unique @p identifier of the entity.
      */
     void setId( Id identifier );
 
     /**
      * Returns the unique identifier of the entity.
      */
     Id id() const;
 
     /**
      * Sets the remote @p id of the entity.
      */
     void setRemoteId( const QString& id );
 
     /**
      * Returns the remote id of the entity.
      */
     QString remoteId() const;
 
     /**
      * Returns whether the entity is valid.
      */
     bool isValid() const;
 
     /**
      * Returns whether the entity's id equals the
      * id of the @p other entity.
      */
     bool operator==( const Entity &other ) const;
 
     /**
      * Returns whether the entity's id does not equal the id
      * of the @p other entity.
      */
     bool operator!=( const Entity &other ) const;
 
     /**
      * Assigns the @p other to this entity and returns a reference to this entity.
      */
     Entity& operator=( const Entity &other );
 
     /**
      * Adds an attribute to the entity.
      *
      * If an attribute of the same type name already exists, it is deleted and
      * replaced with the new one.
      *
      * @param attribute The new attribute.
      *
      * @note The entity takes the ownership of the attribute.
      */
     void addAttribute( Attribute *attribute );
 
     /**
      * Removes and deletes the attribute of the given type @p name.
      */
     void removeAttribute( const QByteArray &name );
 
     /**
      * Returns @c true if the entity has an attribute of the given type @p name,
      * false otherwise.
      */
     bool hasAttribute( const QByteArray &name ) const;
 
     /**
      * Returns a list of all attributes of the entity.
      */
     Attribute::List attributes() const;
 
     /**
      * Removes and deletes all attributes of the entity.
      */
     void clearAttributes();
 
     /**
      * Returns the attribute of the given type @p name if available, 0 otherwise.
      */
     Attribute* attribute( const QByteArray &name ) const;
 
     /**
      * Describes the options that can be passed to access attributes.
      */
     enum CreateOption
     {
       AddIfMissing    ///< Creates the attribute if it is missing
     };
 
     /**
      * Returns the attribute of the requested type.
      * If the entity has no attribute of that type yet, a new one
      * is created and added to the entity.
      *
      * @param option The create options.
      */
     template <typename T> inline T* attribute( CreateOption option )
     {
       Q_UNUSED( option );
 
       const T dummy;
       if ( hasAttribute( dummy.type() ) ) {
         T* attr = dynamic_cast<T*>( attribute( dummy.type() ) );
         if ( attr )
           return attr;
         kWarning( 5250 ) << "Found attribute of unknown type" << dummy.type()
           << ". Did you forget to call AttributeFactory::registerAttribute()?";
       }
 
       T* attr = new T();
       addAttribute( attr );
       return attr;
     }
 
     /**
      * Returns the attribute of the requested type or 0 if it is not available.
      */
     template <typename T> inline T* attribute() const
     {
       const T dummy;
       if ( hasAttribute( dummy.type() ) ) {
         T* attr = dynamic_cast<T*>( attribute( dummy.type() ) );
         if ( attr )
           return attr;
         kWarning( 5250 ) << "Found attribute of unknown type" << dummy.type()
           << ". Did you forget to call AttributeFactory::registerAttribute()?";
       }
 
       return 0;
     }
 
     /**
      * Removes and deletes the attribute of the requested type.
      */
     template <typename T> inline void removeAttribute()
     {
       const T dummy;
       removeAttribute( dummy.type() );
     }
 
     /**
      * Returns whether the entity has an attribute of the requested type.
      */
     template <typename T> inline bool hasAttribute() const
     {
       const T dummy;
       return hasAttribute( dummy.type() );
     }
 
   protected:
     /**
      * Creates an entity from an @p other entity.
      */
     Entity( const Entity &other );
 
     //@cond PRIVATE
     Entity( EntityPrivate *dd );
     QSharedDataPointer<EntityPrivate> d_ptr;
     //@endcond
 
     AKONADI_DECLARE_PRIVATE( Entity )
 };
 
 }
 
 #endif