diff --git a/certmanager/lib/cryptplugfactory.h b/certmanager/lib/cryptplugfactory.h
index 2091b982..05202e3f 100644
--- a/certmanager/lib/cryptplugfactory.h
+++ b/certmanager/lib/cryptplugfactory.h
@@ -39,7 +39,7 @@
 
 #ifndef LIBKLEOPATRA_NO_COMPAT
 namespace Kleo {
-  //typedef CryptoBackendFactory CryptPlugFactory KDE_DEPRECATED;
+  //typedef CryptoBackendFactory CryptPlugFactory TDE_DEPRECATED;
 }
 
 class CryptPlugWrapper;
diff --git a/libkcal/calendarresources.h b/libkcal/calendarresources.h
index 20d5850c..23539fc3 100644
--- a/libkcal/calendarresources.h
+++ b/libkcal/calendarresources.h
@@ -340,7 +340,7 @@ class LIBKCAL_EXPORT CalendarResources :
        @deprecated use
        addIncidence(Incidence *,ResourceCalendar *,const TQString &) instead.
     */
-    KDE_DEPRECATED bool addIncidence( Incidence *incidence, ResourceCalendar *resource );
+    TDE_DEPRECATED bool addIncidence( Incidence *incidence, ResourceCalendar *resource );
 
     /**
        Insert an Incidence into a Calendar Resource.
@@ -362,7 +362,7 @@ class LIBKCAL_EXPORT CalendarResources :
        @return false if the resource could not be computed or if a ticket
        request fails; true otherwise.
     */
-    KDE_DEPRECATED bool beginChange( Incidence *incidence );
+    TDE_DEPRECATED bool beginChange( Incidence *incidence );
 
     /**
        Flag that a change to a Calendar Incidence is starting.
@@ -385,7 +385,7 @@ class LIBKCAL_EXPORT CalendarResources :
        @return false if the resource could not be computed or if a ticket
        save fails; true otherwise.
     */
-    KDE_DEPRECATED bool endChange( Incidence *incidence );
+    TDE_DEPRECATED bool endChange( Incidence *incidence );
 
     /**
        Flag that a change to a Calendar Incidence has completed.
@@ -427,7 +427,7 @@ class LIBKCAL_EXPORT CalendarResources :
        @deprecated use
        addIncidence(Incidence *,ResourceCalendar *,const TQString&) instead.
     */
-    KDE_DEPRECATED bool addEvent( Event *event, ResourceCalendar *resource );
+    TDE_DEPRECATED bool addEvent( Event *event, ResourceCalendar *resource );
 
     /**
        Insert an Event into a Calendar Resource.
@@ -544,7 +544,7 @@ class LIBKCAL_EXPORT CalendarResources :
        @deprecated use
        addIncidence(Incidence *,ResourceCalendar *,const TQString &) instead.
     */
-    KDE_DEPRECATED bool addTodo( Todo *todo, ResourceCalendar *resource );
+    TDE_DEPRECATED bool addTodo( Todo *todo, ResourceCalendar *resource );
 
     /**
        Insert an Todo into a Calendar Resource.
@@ -629,7 +629,7 @@ class LIBKCAL_EXPORT CalendarResources :
        @deprecated use
        addIncidence(Incidence *,ResourceCalendar *,const TQString &) instead.
     */
-    KDE_DEPRECATED bool addJournal( Journal *journal, ResourceCalendar *resource );
+    TDE_DEPRECATED bool addJournal( Journal *journal, ResourceCalendar *resource );
 
     /**
        Insert a Journal into a Calendar Resource.
diff --git a/libkcal/event.h b/libkcal/event.h
index ba0780fb..707453ae 100644
--- a/libkcal/event.h
+++ b/libkcal/event.h
@@ -74,7 +74,7 @@ class LIBKCAL_EXPORT Event : public Incidence
       settings.
       @deprecated use IncidenceFormatter::timeToString()
     */
-    TQString KDE_DEPRECATED dtEndTimeStr() const;
+    TQString TDE_DEPRECATED dtEndTimeStr() const;
     /**
       Return end date as string formatted according to the users locale
       settings.
@@ -83,13 +83,13 @@ class LIBKCAL_EXPORT Event : public Incidence
                       long format
       @deprecated use IncidenceFormatter::dateToString()
     */
-    TQString KDE_DEPRECATED dtEndDateStr( bool shortfmt = true ) const;
+    TQString TDE_DEPRECATED dtEndDateStr( bool shortfmt = true ) const;
     /**
       Return end date and time as string formatted according to the users locale
       settings.
       @deprecated use IncidenceFormatter::dateTimeToString()
     */
-    TQString KDE_DEPRECATED dtEndStr() const;
+    TQString TDE_DEPRECATED dtEndStr() const;
 
     /**
       Set whether the event has an end date/time.
diff --git a/libkcal/incidencebase.h b/libkcal/incidencebase.h
index d54ca879..10a9ab20 100644
--- a/libkcal/incidencebase.h
+++ b/libkcal/incidencebase.h
@@ -139,20 +139,20 @@ class LIBKCAL_EXPORT IncidenceBase : public CustomProperties
       users locale settings.
       @deprecated use IncidenceFormatter::timeToString()
     */
-    virtual KDE_DEPRECATED TQString dtStartTimeStr() const;
+    virtual TDE_DEPRECATED TQString dtStartTimeStr() const;
 
     /**
       returns an event's starting date as a string formatted according to the
       users locale settings
       @deprecated use IncidenceFormatter::dateToString()
     */
-    virtual KDE_DEPRECATED TQString dtStartDateStr( bool shortfmt = true ) const;
+    virtual TDE_DEPRECATED TQString dtStartDateStr( bool shortfmt = true ) const;
     /**
       returns an event's starting date and time as a string formatted according
       to the users locale settings
       @deprecated use IncidenceFormatter::dateTimeToString()
     */
-    virtual KDE_DEPRECATED TQString dtStartStr() const;
+    virtual TDE_DEPRECATED TQString dtStartStr() const;
 
     virtual void setDuration( int seconds );
     int duration() const;
diff --git a/libkcal/incidenceformatter.h b/libkcal/incidenceformatter.h
index b2dcd432..9d6e8a75 100644
--- a/libkcal/incidenceformatter.h
+++ b/libkcal/incidenceformatter.h
@@ -52,20 +52,20 @@ class LIBKCAL_EXPORT InvitationFormatterHelper
 class LIBKCAL_EXPORT IncidenceFormatter
 {
   public:
-    static TQString KDE_DEPRECATED toolTipString( IncidenceBase *incidence, bool richText = true );
+    static TQString TDE_DEPRECATED toolTipString( IncidenceBase *incidence, bool richText = true );
     static TQString toolTipStr( Calendar *calendar,
                                IncidenceBase *incidence,
                                const TQDate &date=TQDate(),
                                bool richText = true );
     static TQString mailBodyString( IncidenceBase *incidencebase );
-    static TQString KDE_DEPRECATED extensiveDisplayString( IncidenceBase *incidence );
+    static TQString TDE_DEPRECATED extensiveDisplayString( IncidenceBase *incidence );
     static TQString extensiveDisplayStr( Calendar *calendar,
                                         IncidenceBase *incidence,
                                         const TQDate &date=TQDate() );
 
     static TQString formatICalInvitation( TQString invitation, Calendar *mCalendar,
                                          InvitationFormatterHelper *helper );
-    static TQString KDE_DEPRECATED formatICalInvitationNoHtml( TQString invitation,
+    static TQString TDE_DEPRECATED formatICalInvitationNoHtml( TQString invitation,
                                                               Calendar *mCalendar,
                                                               InvitationFormatterHelper *helper );
     static TQString formatICalInvitationNoHtml( TQString invitation,
diff --git a/libkcal/resourcecached.h b/libkcal/resourcecached.h
index 6d045808..6465def9 100644
--- a/libkcal/resourcecached.h
+++ b/libkcal/resourcecached.h
@@ -137,7 +137,7 @@ class TDE_EXPORT ResourceCached : public ResourceCalendar,
     /**
       Add event to calendar.
     */
-    KDE_DEPRECATED bool addEvent( Event *event );
+    TDE_DEPRECATED bool addEvent( Event *event );
     bool addEvent( Event *event, const TQString &subresource );
 
     /**
@@ -177,7 +177,7 @@ class TDE_EXPORT ResourceCached : public ResourceCalendar,
     /**
       Add a todo to the todolist.
     */
-    KDE_DEPRECATED bool addTodo( Todo *todo );
+    TDE_DEPRECATED bool addTodo( Todo *todo );
     bool addTodo( Todo *todo, const TQString &subresource );
 
     /**
@@ -200,7 +200,7 @@ class TDE_EXPORT ResourceCached : public ResourceCalendar,
     /**
       Add a Journal entry to calendar
     */
-    KDE_DEPRECATED bool addJournal( Journal *journal );
+    TDE_DEPRECATED bool addJournal( Journal *journal );
     bool addJournal( Journal *journal, const TQString &subresource );
 
     /**
diff --git a/libkcal/resourcecalendar.h b/libkcal/resourcecalendar.h
index e4c97b5c..84530421 100644
--- a/libkcal/resourcecalendar.h
+++ b/libkcal/resourcecalendar.h
@@ -144,7 +144,7 @@ class LIBKCAL_EXPORT ResourceCalendar : public KRES::Resource
       Add incidence to resource.
       @deprecated use addIncidence(Incidence *,const TQString &) instead.
     */
-    virtual KDE_DEPRECATED bool addIncidence( Incidence * );
+    virtual TDE_DEPRECATED bool addIncidence( Incidence * );
 
     /**
       Add incidence to resource and subresource.
@@ -166,7 +166,7 @@ class LIBKCAL_EXPORT ResourceCalendar : public KRES::Resource
       Add event to resource.
       @deprecated use addEvent(Event *,const TQString&) instead.
     */
-    virtual KDE_DEPRECATED bool addEvent( Event *event ) = 0;
+    virtual TDE_DEPRECATED bool addEvent( Event *event ) = 0;
     virtual bool addEvent( Event *event, const TQString &subresource ) = 0;
 
     /**
@@ -270,7 +270,7 @@ class LIBKCAL_EXPORT ResourceCalendar : public KRES::Resource
       Add a todo to the todolist.
       @deprecated use addTodo(Todo *,const TQString &) instead.
     */
-    virtual KDE_DEPRECATED bool addTodo( Todo *todo ) = 0;
+    virtual TDE_DEPRECATED bool addTodo( Todo *todo ) = 0;
     virtual bool addTodo( Todo *todo,  const TQString &subresource ) = 0;
 
     /**
@@ -297,7 +297,7 @@ class LIBKCAL_EXPORT ResourceCalendar : public KRES::Resource
       Add a Journal entry to the resource.
       @deprecated use addJournal(Journal *,const TQString &) instead.
     */
-    virtual KDE_DEPRECATED bool addJournal( Journal * ) = 0;
+    virtual TDE_DEPRECATED bool addJournal( Journal * ) = 0;
     virtual bool addJournal( Journal *journal, const TQString &subresource ) = 0;
 
     /**
diff --git a/libkcal/scheduler.h b/libkcal/scheduler.h
index 4d97ab51..fe6c430a 100644
--- a/libkcal/scheduler.h
+++ b/libkcal/scheduler.h
@@ -174,7 +174,7 @@ class LIBKCAL_EXPORT Scheduler
     bool acceptRequest( IncidenceBase *, ScheduleMessage::Status status,
                         const TQString & attendee );
     bool acceptAdd( IncidenceBase *, ScheduleMessage::Status status );
-    KDE_DEPRECATED bool acceptCancel( IncidenceBase *, ScheduleMessage::Status status );
+    TDE_DEPRECATED bool acceptCancel( IncidenceBase *, ScheduleMessage::Status status );
     bool acceptCancel( IncidenceBase *, ScheduleMessage::Status status,
                        const TQString & attendee );
     bool acceptDeclineCounter( IncidenceBase *,
diff --git a/libkcal/todo.h b/libkcal/todo.h
index 74e1b39d..25e63045 100644
--- a/libkcal/todo.h
+++ b/libkcal/todo.h
@@ -68,7 +68,7 @@ class LIBKCAL_EXPORT Todo : public Incidence
       settings.
       @deprecated use IncidenceFormatter::timeToString()
     */
-    KDE_DEPRECATED TQString dtDueTimeStr() const;
+    TDE_DEPRECATED TQString dtDueTimeStr() const;
 
     /**
       Returns due date as string formatted according to the users locale
@@ -78,14 +78,14 @@ class LIBKCAL_EXPORT Todo : public Incidence
                       long format.
       @deprecated use IncidenceFormatter::dateToString()
     */
-    KDE_DEPRECATED TQString dtDueDateStr( bool shortfmt = true ) const;
+    TDE_DEPRECATED TQString dtDueDateStr( bool shortfmt = true ) const;
 
     /**
       Returns due date and time as string formatted according to the users locale
       settings.
       @deprecated use IncidenceFormatter::dateTimeToString()
     */
-    KDE_DEPRECATED TQString dtDueStr() const;
+    TDE_DEPRECATED TQString dtDueStr() const;
 
     /**
       Returns true if the todo has a due date, otherwise return false.
diff --git a/libkholidays/kholidays.h b/libkholidays/kholidays.h
index 5afc63fc..9dfc55da 100644
--- a/libkholidays/kholidays.h
+++ b/libkholidays/kholidays.h
@@ -63,11 +63,11 @@ class TDE_EXPORT KHolidays {
 
     TQValueList<KHoliday> getHolidays( const TQDate& );
     
-    KDE_DEPRECATED TQString shortText( const TQDate& );
-    KDE_DEPRECATED TQString getHoliday( const TQDate& );
+    TDE_DEPRECATED TQString shortText( const TQDate& );
+    TDE_DEPRECATED TQString getHoliday( const TQDate& );
 
     enum { WORKDAY, HOLIDAY };
-    KDE_DEPRECATED int category( const TQDate& );
+    TDE_DEPRECATED int category( const TQDate& );
 
   private:
     bool parseFile( const TQDate& );
diff --git a/libkpimidentities/identity.h b/libkpimidentities/identity.h
index cfc44260..31deaca7 100644
--- a/libkpimidentities/identity.h
+++ b/libkpimidentities/identity.h
@@ -186,8 +186,8 @@ public:
   TQString organization() const { return mOrganization; }
   void setOrganization(const TQString&);
 
-  KDE_DEPRECATED TQCString pgpIdentity() const { return pgpEncryptionKey(); }
-  KDE_DEPRECATED void setPgpIdentity( const TQCString & key ) {
+  TDE_DEPRECATED TQCString pgpIdentity() const { return pgpEncryptionKey(); }
+  TDE_DEPRECATED void setPgpIdentity( const TQCString & key ) {
     setPGPEncryptionKey( key );
     setPGPSigningKey( key );
   }
@@ -212,8 +212,8 @@ public:
   void setPreferredCryptoMessageFormat( Kleo::CryptoMessageFormat format ) { mPreferredCryptoMessageFormat = format; }
 
   /** email address (without the user name - only name\@host) */
-  KDE_DEPRECATED TQString emailAddr() const { return primaryEmailAddress(); }
-  KDE_DEPRECATED void setEmailAddr( const TQString & email ) { setPrimaryEmailAddress( email ); }
+  TDE_DEPRECATED TQString emailAddr() const { return primaryEmailAddress(); }
+  TDE_DEPRECATED void setEmailAddr( const TQString & email ) { setPrimaryEmailAddress( email ); }
 
   /** primary email address (without the user name - only name\@host).
       The primary email address is used for all outgoing mail. */
diff --git a/tderesources/birthdays/resourcetdeabc.h b/tderesources/birthdays/resourcetdeabc.h
index 1b25fd07..7cc2f771 100644
--- a/tderesources/birthdays/resourcetdeabc.h
+++ b/tderesources/birthdays/resourcetdeabc.h
@@ -77,7 +77,7 @@ class TDE_EXPORT ResourceTDEABC : public ResourceCalendar
     TDEABC::Lock *lock();
 
     /** Add Event to calendar. */
-    KDE_DEPRECATED bool addEvent(Event *event);
+    TDE_DEPRECATED bool addEvent(Event *event);
     bool addEvent( Event *event, const TQString &subresource );
     /** deletes an event from this calendar. */
     bool deleteEvent(Event *);
@@ -109,7 +109,7 @@ class TDE_EXPORT ResourceTDEABC : public ResourceCalendar
     /**
       Add a todo to the todolist.
     */
-    KDE_DEPRECATED bool addTodo( Todo *todo );
+    TDE_DEPRECATED bool addTodo( Todo *todo );
     bool addTodo( Todo *todo, const TQString &subresource );
     /**
       Remove a todo from the todolist.
@@ -129,7 +129,7 @@ class TDE_EXPORT ResourceTDEABC : public ResourceCalendar
     */
     Todo::List rawTodosForDate( const TQDate &date );
     /** Add a Journal entry to calendar */
-    KDE_DEPRECATED bool addJournal( Journal *journal );
+    TDE_DEPRECATED bool addJournal( Journal *journal );
     bool addJournal( Journal *journal, const TQString &subresource );
 
     /** Remove journal from the calendar. */
diff --git a/tderesources/exchange/resourceexchange.h b/tderesources/exchange/resourceexchange.h
index 23113dad..c944e9d7 100644
--- a/tderesources/exchange/resourceexchange.h
+++ b/tderesources/exchange/resourceexchange.h
@@ -84,7 +84,7 @@ class ResourceExchange : public ResourceCalendar, public IncidenceBase::Observer
 //    void close();
 
     /** Add Event to calendar. */
-    KDE_DEPRECATED bool addEvent( Event *event );
+    TDE_DEPRECATED bool addEvent( Event *event );
     bool addEvent( Event *event, const TQString &subresource );
 
     /** deletes an event from this calendar. */
@@ -121,7 +121,7 @@ class ResourceExchange : public ResourceCalendar, public IncidenceBase::Observer
     /**
       Add a todo to the todolist.
     */
-    KDE_DEPRECATED bool addTodo( Todo *todo );
+    TDE_DEPRECATED bool addTodo( Todo *todo );
     bool addTodo( Todo *todo, const TQString &subresource );
     /**
       Remove a todo from the todolist.
@@ -142,7 +142,7 @@ class ResourceExchange : public ResourceCalendar, public IncidenceBase::Observer
     Todo::List rawTodosForDate( const TQDate &date );
 
     /** Add a Journal entry to calendar */
-    KDE_DEPRECATED bool addJournal( Journal *journal );
+    TDE_DEPRECATED bool addJournal( Journal *journal );
     bool addJournal( Journal *journal, const TQString &subresource );
     /** deletes an event from this calendar. */
     virtual bool deleteJournal(Journal *);
diff --git a/tderesources/kolab/kcal/resourcekolab.h b/tderesources/kolab/kcal/resourcekolab.h
index 9700afe9..b8670151 100644
--- a/tderesources/kolab/kcal/resourcekolab.h
+++ b/tderesources/kolab/kcal/resourcekolab.h
@@ -71,7 +71,7 @@ public:
   void doClose();
 
   // The libkcal functions. See the resource for descriptions
-  KDE_DEPRECATED bool addEvent( KCal::Event *event );
+  TDE_DEPRECATED bool addEvent( KCal::Event *event );
   bool addEvent( KCal::Event *event, const TQString &subResource );
   bool deleteEvent( KCal::Event * );
   KCal::Event* event( const TQString &UniqueStr );
@@ -84,14 +84,14 @@ public:
   KCal::Event::List rawEvents( const TQDate& start, const TQDate& end,
                                bool inclusive = false );
 
-  KDE_DEPRECATED bool addTodo( KCal::Todo * todo );
+  TDE_DEPRECATED bool addTodo( KCal::Todo * todo );
   bool addTodo( KCal::Todo *todo, const TQString &subResource );
   bool deleteTodo( KCal::Todo * );
   KCal::Todo* todo( const TQString &uid );
   KCal::Todo::List rawTodos( TodoSortField sortField = TodoSortUnsorted, SortDirection sortDirection = SortDirectionAscending );
   KCal::Todo::List rawTodosForDate( const TQDate& date );
 
-  KDE_DEPRECATED bool addJournal( KCal::Journal * );
+  TDE_DEPRECATED bool addJournal( KCal::Journal * );
   bool addJournal( KCal::Journal *, const TQString &subResource );
   bool deleteJournal( KCal::Journal * );
   KCal::Journal* journal( const TQString &uid );