Rename many classes and header files to avoid conflicts with KDE4

152 files changed, 215 insertions, 215 deletions

diff --git a/kopete/KABC_INTEG_NOTES b/kopete/KABC_INTEG_NOTES
index 2cf33e8e..561b27ec 100644
--- a/kopete/KABC_INTEG_NOTES
+++ b/kopete/KABC_INTEG_NOTES
@@ -57,7 +57,7 @@ Policy:
 One way kopete->kabc contacts
 , achieve bidi later
 <Bille> what about the sync policy between IM contacts contained in kabc and in kopete
-<spaze> mETz: alt-enter doesn't work? report a bug to klistview/qlistview, that sucks :( </ot>
+<spaze> mETz: alt-enter doesn't work? report a bug to tdelistview/qlistview, that sucks :( </ot>
 <gregj> hyhy
 <spaze> Bille: implied i'd say
 <Bille> for example - in Addressee A I already have 3 IM id's added with another client - if i associate him with a Kopete MC
diff --git a/kopete/kopete/addaccountwizard/addaccountwizard.cpp b/kopete/kopete/addaccountwizard/addaccountwizard.cpp
index 1c42acf2..4ec11657 100644
--- a/kopete/kopete/addaccountwizard/addaccountwizard.cpp
+++ b/kopete/kopete/addaccountwizard/addaccountwizard.cpp
@@ -24,7 +24,7 @@
 #include <kcolorbutton.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kplugininfo.h>
diff --git a/kopete/kopete/addaccountwizard/addaccountwizardpage1.ui b/kopete/kopete/addaccountwizard/addaccountwizardpage1.ui
index 5c722a0e..e9df15e7 100644
--- a/kopete/kopete/addaccountwizard/addaccountwizardpage1.ui
+++ b/kopete/kopete/addaccountwizard/addaccountwizardpage1.ui
@@ -139,6 +139,6 @@
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/kopete/kopete/addcontactwizard/addcontactwizard.cpp b/kopete/kopete/addcontactwizard/addcontactwizard.cpp
index 02523865..5e461f53 100644
--- a/kopete/kopete/addcontactwizard/addcontactwizard.cpp
+++ b/kopete/kopete/addcontactwizard/addcontactwizard.cpp
@@ -56,14 +56,14 @@
 
 #include <kpushbutton.h>
 #include <kdebug.h>
-#include <klistview.h>
+#include <tdelistview.h>
 // used for its AddresseeItem class
 #include <kabc/addresseedialog.h>
 #include <kabc/addressbook.h>
 #include <kabc/stdaddressbook.h>
 
 #include <addcontactpage.h>
-#include "addressbookselectorwidget.h"
+#include "addressbootdeselectorwidget.h"
 #include "addcontactwizard.h"
 #include "kopetecontactlist.h"
 #include "kopetemetacontact.h"
diff --git a/kopete/kopete/addcontactwizard/addcontactwizard_base.ui b/kopete/kopete/addcontactwizard/addcontactwizard_base.ui
index ff9ec4dc..02266016 100644
--- a/kopete/kopete/addcontactwizard/addcontactwizard_base.ui
+++ b/kopete/kopete/addcontactwizard/addcontactwizard_base.ui
@@ -480,8 +480,8 @@
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/kopete/kopete/addcontactwizard/fastaddcontactwizard.h b/kopete/kopete/addcontactwizard/fastaddcontactwizard.h
index 1313e04f..5a424d1a 100644
--- a/kopete/kopete/addcontactwizard/fastaddcontactwizard.h
+++ b/kopete/kopete/addcontactwizard/fastaddcontactwizard.h
@@ -21,14 +21,14 @@
 #ifndef FASTADDCONTACTWIZARD_H
 #define FASTADDCONTACTWIZARD_H
 #include <kdebug.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include <tqptrlist.h>
 #include <tqvaluelist.h>
 #include <tqmap.h>
 
 #include <kdebug.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include "fastaddcontactwizard_base.h"
 
diff --git a/kopete/kopete/addcontactwizard/fastaddcontactwizard_base.ui b/kopete/kopete/addcontactwizard/fastaddcontactwizard_base.ui
index 5bd2f3a8..88e7ecba 100644
--- a/kopete/kopete/addcontactwizard/fastaddcontactwizard_base.ui
+++ b/kopete/kopete/addcontactwizard/fastaddcontactwizard_base.ui
@@ -214,6 +214,6 @@
 </images>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/kopete/kopete/chatwindow/chatmemberslistwidget.cpp b/kopete/kopete/chatwindow/chatmemberslistwidget.cpp
index 15b9fb56..e0817490 100644
--- a/kopete/kopete/chatwindow/chatmemberslistwidget.cpp
+++ b/kopete/kopete/chatwindow/chatmemberslistwidget.cpp
@@ -30,7 +30,7 @@
 #include <kabc/vcardconverter.h>
 #include <kdebug.h>
 #include <tdemultipledrag.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include <tqheader.h>
 #include <tqtooltip.h>
diff --git a/kopete/kopete/chatwindow/chatmemberslistwidget.h b/kopete/kopete/chatwindow/chatmemberslistwidget.h
index 5108ae5c..5480de0d 100644
--- a/kopete/kopete/chatwindow/chatmemberslistwidget.h
+++ b/kopete/kopete/chatwindow/chatmemberslistwidget.h
@@ -18,7 +18,7 @@
 #ifndef CHATMEMBERSLISTWIDGET_H
 #define CHATMEMBERSLISTWIDGET_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include <tqmap.h>
 
diff --git a/kopete/kopete/chatwindow/chatmessagepart.cpp b/kopete/kopete/chatwindow/chatmessagepart.cpp
index 52d5e99e..c894cb9a 100644
--- a/kopete/kopete/chatwindow/chatmessagepart.cpp
+++ b/kopete/kopete/chatwindow/chatmessagepart.cpp
@@ -55,7 +55,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <tdemultipledrag.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <krun.h>
 #include <kstringhandler.h>
 #include <ktempfile.h>
diff --git a/kopete/kopete/chatwindow/chatview.cpp b/kopete/kopete/chatwindow/chatview.cpp
index bf40970a..3c58cb50 100644
--- a/kopete/kopete/chatwindow/chatview.cpp
+++ b/kopete/kopete/chatwindow/chatview.cpp
@@ -37,7 +37,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstringhandler.h>
 #include <twin.h>
 #include <kurldrag.h>
diff --git a/kopete/kopete/chatwindow/kopetechatwindow.cpp b/kopete/kopete/chatwindow/kopetechatwindow.cpp
index 5d1d2d11..105cf912 100644
--- a/kopete/kopete/chatwindow/kopetechatwindow.cpp
+++ b/kopete/kopete/chatwindow/kopetechatwindow.cpp
@@ -31,7 +31,7 @@
 #include <klocale.h>
 #include <kmenubar.h>
 #include <tdeconfig.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <twin.h>
@@ -45,7 +45,7 @@
 #include <kdialog.h>
 #include <kstringhandler.h>
 #include <ksqueezedtextlabel.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <kglobalsettings.h>
 
 #include "chatmessagepart.h"
@@ -64,7 +64,7 @@
 #include "kopeteviewmanager.h"
 
 #include <tqtoolbutton.h>
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 
 typedef TQMap<Kopete::Account*,KopeteChatWindow*> AccountMap;
 typedef TQMap<Kopete::Group*,KopeteChatWindow*> GroupMap;
diff --git a/kopete/kopete/chatwindow/kopeteemailwindow.cpp b/kopete/kopete/chatwindow/kopeteemailwindow.cpp
index cc4e6fa9..4af0ec95 100644
--- a/kopete/kopete/chatwindow/kopeteemailwindow.cpp
+++ b/kopete/kopete/chatwindow/kopeteemailwindow.cpp
@@ -31,7 +31,7 @@
 #include "kopetestdaction.h"
 #include "kopeteviewmanager.h"
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kcolordialog.h>
 #include <tdeconfig.h>
@@ -39,7 +39,7 @@
 #include <kdebug.h>
 #include <tdeversion.h>
 #include <kedittoolbar.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
 #include <kglobalsettings.h>
 #include <tdehtmlview.h>
 #include <kiconloader.h>
@@ -48,7 +48,7 @@
 #include <klocale.h>
 #include <kmenubar.h>
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kpushbutton.h>
 #include <ktextedit.h>
 #include <twin.h>
diff --git a/kopete/kopete/chatwindow/kopeteemailwindow.h b/kopete/kopete/chatwindow/kopeteemailwindow.h
index 7d7991ca..e3c18d5e 100644
--- a/kopete/kopete/chatwindow/kopeteemailwindow.h
+++ b/kopete/kopete/chatwindow/kopeteemailwindow.h
@@ -22,7 +22,7 @@
 
 #include "kopeteview.h"
 #include "kopeteviewplugin.h"
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <tdeparts/mainwindow.h>
 
 namespace KParts { struct URLArgs; }
diff --git a/kopete/kopete/chatwindow/kopeteemoticonaction.cpp b/kopete/kopete/chatwindow/kopeteemoticonaction.cpp
index 8c2811c9..a5aaed41 100644
--- a/kopete/kopete/chatwindow/kopeteemoticonaction.cpp
+++ b/kopete/kopete/chatwindow/kopeteemoticonaction.cpp
@@ -28,9 +28,9 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmenubar.h>
-#include <kpopupmenu.h>
-#include <ktoolbar.h>
-#include <ktoolbarbutton.h>
+#include <tdepopupmenu.h>
+#include <tdetoolbar.h>
+#include <tdetoolbarbutton.h>
 
 #include "emoticonselector.h"
 #include "kopeteemoticons.h"
diff --git a/kopete/kopete/chatwindow/kopeteemoticonaction.h b/kopete/kopete/chatwindow/kopeteemoticonaction.h
index bc1a9859..034c0737 100644
--- a/kopete/kopete/chatwindow/kopeteemoticonaction.h
+++ b/kopete/kopete/chatwindow/kopeteemoticonaction.h
@@ -21,7 +21,7 @@
 #ifndef _KOPETEEMOTICONACTION_H_
 #define _KOPETEEMOTICONACTION_H_
 
-#include <kaction.h>
+#include <tdeaction.h>
 
 class KopeteEmoticonAction : public TDEAction
 {
diff --git a/kopete/kopete/chatwindow/krichtexteditpart.cpp b/kopete/kopete/chatwindow/krichtexteditpart.cpp
index 4d8a0f8d..df9f2c76 100644
--- a/kopete/kopete/chatwindow/krichtexteditpart.cpp
+++ b/kopete/kopete/chatwindow/krichtexteditpart.cpp
@@ -1,8 +1,8 @@
 #include <ktextedit.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcolordialog.h>
 #include <kglobalsettings.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
 #include <tdeversion.h>
diff --git a/kopete/kopete/config/accounts/kopeteaccountconfig.cpp b/kopete/kopete/config/accounts/kopeteaccountconfig.cpp
index d779eac0..71691706 100644
--- a/kopete/kopete/config/accounts/kopeteaccountconfig.cpp
+++ b/kopete/kopete/config/accounts/kopeteaccountconfig.cpp
@@ -28,7 +28,7 @@
 #include <kdialogbase.h>
 #include <kgenericfactory.h>
 #include <kiconloader.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 
diff --git a/kopete/kopete/config/accounts/kopeteaccountconfigbase.ui b/kopete/kopete/config/accounts/kopeteaccountconfigbase.ui
index 8162208c..1c93e6dc 100644
--- a/kopete/kopete/config/accounts/kopeteaccountconfigbase.ui
+++ b/kopete/kopete/config/accounts/kopeteaccountconfigbase.ui
@@ -261,7 +261,7 @@ The priority is used to determine which contact to use when you click on a metac
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
 </includehints>
diff --git a/kopete/kopete/config/appearance/appearanceconfig.cpp b/kopete/kopete/config/appearance/appearanceconfig.cpp
index 869641e9..89f7655e 100644
--- a/kopete/kopete/config/appearance/appearanceconfig.cpp
+++ b/kopete/kopete/config/appearance/appearanceconfig.cpp
@@ -45,7 +45,7 @@
 #include <kcolorbutton.h>
 #include <tdeconfig.h> // for KNewStuff emoticon fetching
 #include <kdebug.h>
-#include <kfontrequester.h>
+#include <tdefontrequester.h>
 #include <kgenericfactory.h>
 #include <tdeio/netaccess.h>
 #include <tdehtmlview.h>
diff --git a/kopete/kopete/config/appearance/appearanceconfig_chatwindow.ui b/kopete/kopete/config/appearance/appearanceconfig_chatwindow.ui
index ed7d5cf9..3e31cc2d 100644
--- a/kopete/kopete/config/appearance/appearanceconfig_chatwindow.ui
+++ b/kopete/kopete/config/appearance/appearanceconfig_chatwindow.ui
@@ -187,7 +187,7 @@
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/kopete/kopete/config/appearance/appearanceconfig_colors.ui b/kopete/kopete/config/appearance/appearanceconfig_colors.ui
index a4adb253..6babf4ed 100644
--- a/kopete/kopete/config/appearance/appearanceconfig_colors.ui
+++ b/kopete/kopete/config/appearance/appearanceconfig_colors.ui
@@ -447,10 +447,10 @@
     <includehint>kcolorbutton.h</includehint>
     <includehint>kcolorbutton.h</includehint>
     <includehint>kcolorbutton.h</includehint>
-    <includehint>kfontrequester.h</includehint>
-    <includehint>kfontrequester.h</includehint>
-    <includehint>kfontrequester.h</includehint>
-    <includehint>kfontrequester.h</includehint>
+    <includehint>tdefontrequester.h</includehint>
+    <includehint>tdefontrequester.h</includehint>
+    <includehint>tdefontrequester.h</includehint>
+    <includehint>tdefontrequester.h</includehint>
     <includehint>kcolorbutton.h</includehint>
     <includehint>kcolorbutton.h</includehint>
 </includehints>
diff --git a/kopete/kopete/config/appearance/appearanceconfig_emoticons.ui b/kopete/kopete/config/appearance/appearanceconfig_emoticons.ui
index 1cc3153d..0c9078b7 100644
--- a/kopete/kopete/config/appearance/appearanceconfig_emoticons.ui
+++ b/kopete/kopete/config/appearance/appearanceconfig_emoticons.ui
@@ -230,7 +230,7 @@
 </connections>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
     <includehint>ktextedit.h</includehint>
 </includehints>
 </UI>
diff --git a/kopete/kopete/config/appearance/emoticonseditdialog.cpp b/kopete/kopete/config/appearance/emoticonseditdialog.cpp
index ce252a8f..11bc5ae4 100644
--- a/kopete/kopete/config/appearance/emoticonseditdialog.cpp
+++ b/kopete/kopete/config/appearance/emoticonseditdialog.cpp
@@ -21,7 +21,7 @@
 #include "kopeteemoticons.h"
 
 #include <klocale.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kstandarddirs.h>
 #include <tdefiledialog.h>
 #include <tdeio/job.h>
diff --git a/kopete/kopete/config/appearance/emoticonseditwidget.ui b/kopete/kopete/config/appearance/emoticonseditwidget.ui
index a90031d2..a9a78175 100644
--- a/kopete/kopete/config/appearance/emoticonseditwidget.ui
+++ b/kopete/kopete/config/appearance/emoticonseditwidget.ui
@@ -82,6 +82,6 @@
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/kopete/kopete/config/appearance/tooltipeditdialog.cpp b/kopete/kopete/config/appearance/tooltipeditdialog.cpp
index e5fb0b16..c83fd1c8 100644
--- a/kopete/kopete/config/appearance/tooltipeditdialog.cpp
+++ b/kopete/kopete/config/appearance/tooltipeditdialog.cpp
@@ -27,7 +27,7 @@
 #include <tqstringlist.h>
 
 #include <kiconloader.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 
 class TooltipItem : public TDEListViewItem
diff --git a/kopete/kopete/config/appearance/tooltipeditwidget.ui b/kopete/kopete/config/appearance/tooltipeditwidget.ui
index ec250cea..d7f863cd 100644
--- a/kopete/kopete/config/appearance/tooltipeditwidget.ui
+++ b/kopete/kopete/config/appearance/tooltipeditwidget.ui
@@ -209,7 +209,7 @@
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/kopete/kopete/config/identity/kopeteidentityconfig.cpp b/kopete/kopete/config/identity/kopeteidentityconfig.cpp
index 1d513964..0f28e403 100644
--- a/kopete/kopete/config/identity/kopeteidentityconfig.cpp
+++ b/kopete/kopete/config/identity/kopeteidentityconfig.cpp
@@ -60,7 +60,7 @@
 #include "kopeteaccount.h"
 #include "kopetecontact.h"
 #include "kopetecontactlist.h"
-#include "addressbookselectordialog.h"
+#include "addressbootdeselectordialog.h"
 #include "kopeteconfig.h"
 
 // Local includes
diff --git a/kopete/kopete/contactlist/kopeteaddrbookexport.cpp b/kopete/kopete/contactlist/kopeteaddrbookexport.cpp
index fd2b5c18..dc283e1b 100644
--- a/kopete/kopete/contactlist/kopeteaddrbookexport.cpp
+++ b/kopete/kopete/contactlist/kopeteaddrbookexport.cpp
@@ -24,7 +24,7 @@
 
 #include <kdialogbase.h>
 #include <kiconloader.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <klocale.h>
 
 #include "kopeteaccount.h"
diff --git a/kopete/kopete/contactlist/kopetecontactlistview.cpp b/kopete/kopete/contactlist/kopetecontactlistview.cpp
index 54f52528..bafc62c5 100644
--- a/kopete/kopete/contactlist/kopetecontactlistview.cpp
+++ b/kopete/kopete/contactlist/kopetecontactlistview.cpp
@@ -33,14 +33,14 @@
 #include <tqtooltip.h>
 #include <tqguardedptr.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kurldrag.h>
 #include <tdemultipledrag.h>
 #include <kabc/stdaddressbook.h>
diff --git a/kopete/kopete/contactlist/kopetegrouplistaction.cpp b/kopete/kopete/contactlist/kopetegrouplistaction.cpp
index a2606ab9..212381fc 100644
--- a/kopete/kopete/contactlist/kopetegrouplistaction.cpp
+++ b/kopete/kopete/contactlist/kopetegrouplistaction.cpp
@@ -22,7 +22,7 @@
 #include <kdebug.h>
 #include <kguiitem.h>
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <twin.h>
 #include <kcmultidialog.h>
 
diff --git a/kopete/kopete/contactlist/kopetegrouplistaction.h b/kopete/kopete/contactlist/kopetegrouplistaction.h
index a9c1a502..8230e030 100644
--- a/kopete/kopete/contactlist/kopetegrouplistaction.h
+++ b/kopete/kopete/contactlist/kopetegrouplistaction.h
@@ -20,7 +20,7 @@
 #define KOPETEGRLISTACT_H
 
 
-#include <kaction.h>
+#include <tdeaction.h>
 
 
 /**
diff --git a/kopete/kopete/contactlist/kopetelviprops.cpp b/kopete/kopete/contactlist/kopetelviprops.cpp
index f64af84d..6a3f0ba1 100644
--- a/kopete/kopete/contactlist/kopetelviprops.cpp
+++ b/kopete/kopete/contactlist/kopetelviprops.cpp
@@ -54,7 +54,7 @@
 #include "kopeteaccount.h"
 #include "kopeteprotocol.h"
 #include "addressbooklinkwidget.h"
-#include "addressbookselectordialog.h"
+#include "addressbootdeselectordialog.h"
 
 #include "customnotificationprops.h"
 #include "customnotifications.h"
diff --git a/kopete/kopete/contactlist/kopetemetacontactlvi.cpp b/kopete/kopete/contactlist/kopetemetacontactlvi.cpp
index 19529351..374c92bc 100644
--- a/kopete/kopete/contactlist/kopetemetacontactlvi.cpp
+++ b/kopete/kopete/contactlist/kopetemetacontactlvi.cpp
@@ -32,7 +32,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kpassivepopup.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kglobal.h>
 #include <tdeconfig.h>
 #include <kapplication.h>
diff --git a/kopete/kopete/contactlist/kopetemetacontactlvi.h b/kopete/kopete/contactlist/kopetemetacontactlvi.h
index 1b766b44..22466102 100644
--- a/kopete/kopete/contactlist/kopetemetacontactlvi.h
+++ b/kopete/kopete/contactlist/kopetemetacontactlvi.h
@@ -27,7 +27,7 @@
 #include <tqpixmap.h>
 #include <tqptrdict.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 class TQVariant;
 
diff --git a/kopete/kopete/contactlist/kopetestatusgroupviewitem.h b/kopete/kopete/contactlist/kopetestatusgroupviewitem.h
index 3d71375e..d38fdb03 100644
--- a/kopete/kopete/contactlist/kopetestatusgroupviewitem.h
+++ b/kopete/kopete/contactlist/kopetestatusgroupviewitem.h
@@ -20,7 +20,7 @@
 #ifndef KOPETESTATUSGROUPVIEWITEM_H
 #define KOPETESTATUSGROUPVIEWITEM_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include "kopetemetacontact.h"
 
 /**
diff --git a/kopete/kopete/kopeteeditglobalidentitywidget.cpp b/kopete/kopete/kopeteeditglobalidentitywidget.cpp
index 97bd1732..74f740d8 100644
--- a/kopete/kopete/kopeteeditglobalidentitywidget.cpp
+++ b/kopete/kopete/kopeteeditglobalidentitywidget.cpp
@@ -28,7 +28,7 @@
 #include <klineedit.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
 #include <tdefiledialog.h>
diff --git a/kopete/kopete/kopetewindow.cpp b/kopete/kopete/kopetewindow.cpp
index a631f304..6e9d9ae7 100644
--- a/kopete/kopete/kopetewindow.cpp
+++ b/kopete/kopete/kopetewindow.cpp
@@ -30,16 +30,16 @@
 #include <tqevent.h>
 #include <tqsignalmapper.h>
 
-#include <kaction.h>
-#include <kactionclasses.h>
+#include <tdeaction.h>
+#include <tdeactionclasses.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
 #include <knotifydialog.h>
-#include <kpopupmenu.h>
-#include <kaccel.h>
+#include <tdepopupmenu.h>
+#include <tdeaccel.h>
 #include <kkeydialog.h>
 #include <kedittoolbar.h>
 #include <kmenubar.h>
diff --git a/kopete/kopete/kopetewindow.h b/kopete/kopete/kopetewindow.h
index 881382c0..aad7155c 100644
--- a/kopete/kopete/kopetewindow.h
+++ b/kopete/kopete/kopetewindow.h
@@ -22,7 +22,7 @@
 
 #include <tqptrdict.h>
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <tqlabel.h>
 
 class TQHBox;
diff --git a/kopete/kopete/systemtray.cpp b/kopete/kopete/systemtray.cpp
index 009ac09d..782a3a55 100644
--- a/kopete/kopete/systemtray.cpp
+++ b/kopete/kopete/systemtray.cpp
@@ -25,7 +25,7 @@
 
 #include <twin.h>
 #include <kaboutdata.h>
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
 #include <kapplication.h>
 #include <kdebug.h>
 #include <kiconloader.h>
diff --git a/kopete/libkopete/compat/kpixmapregionselectorwidget.cpp b/kopete/libkopete/compat/kpixmapregionselectorwidget.cpp
index ccecf81a..8b658e03 100644
--- a/kopete/libkopete/compat/kpixmapregionselectorwidget.cpp
+++ b/kopete/libkopete/compat/kpixmapregionselectorwidget.cpp
@@ -31,8 +31,8 @@
 #include <kimageeffect.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
-#include <kaction.h>
+#include <tdepopupmenu.h>
+#include <tdeaction.h>
 #include <stdlib.h>
 #include <tqcursor.h>
 #include <tqapplication.h>
diff --git a/kopete/libkopete/kopeteaccount.cpp b/kopete/libkopete/kopeteaccount.cpp
index 08f7a95e..70b88819 100644
--- a/kopete/libkopete/kopeteaccount.cpp
+++ b/kopete/libkopete/kopeteaccount.cpp
@@ -26,8 +26,8 @@
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kiconeffect.h>
-#include <kaction.h>
-#include <kpopupmenu.h>
+#include <tdeaction.h>
+#include <tdepopupmenu.h>
 #include <kmessagebox.h>
 #include <knotifyclient.h>
 
diff --git a/kopete/libkopete/kopeteawayaction.h b/kopete/libkopete/kopeteawayaction.h
index 805d6c89..a5a9def4 100644
--- a/kopete/libkopete/kopeteawayaction.h
+++ b/kopete/libkopete/kopeteawayaction.h
@@ -19,8 +19,8 @@
 #define KOPETEAWAYACTION_H
 
 #include <tdeversion.h>
-#include <kactionclasses.h>
-#include <kaction.h>
+#include <tdeactionclasses.h>
+#include <tdeaction.h>
 
 #include "kopete_export.h"
 
diff --git a/kopete/libkopete/kopeteblactdelister.cpp b/kopete/libkopete/kopeteblacklister.cpp
index e249d736..e249d736 100644
--- a/kopete/libkopete/kopeteblactdelister.cpp
+++ b/kopete/libkopete/kopeteblacklister.cpp
diff --git a/kopete/libkopete/kopeteblactdelister.h b/kopete/libkopete/kopeteblacklister.h
index 29bf9d79..29bf9d79 100644
--- a/kopete/libkopete/kopeteblactdelister.h
+++ b/kopete/libkopete/kopeteblacklister.h
diff --git a/kopete/libkopete/kopetecommandhandler.cpp b/kopete/libkopete/kopetecommandhandler.cpp
index 63269c4b..cb96ee5c 100644
--- a/kopete/libkopete/kopetecommandhandler.cpp
+++ b/kopete/libkopete/kopetecommandhandler.cpp
@@ -21,7 +21,7 @@
 #include <kprocess.h>
 #include <tdeversion.h>
 #include <kxmlguiclient.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tqdom.h>
 
 #include "kopetechatsessionmanager.h"
diff --git a/kopete/libkopete/kopetecommandhandler.h b/kopete/libkopete/kopetecommandhandler.h
index ebaae2c1..80f95872 100644
--- a/kopete/libkopete/kopetecommandhandler.h
+++ b/kopete/libkopete/kopetecommandhandler.h
@@ -18,7 +18,7 @@
 #define _KOPETECOMMANDHANDLER_H_
 
 #include <tqdict.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 #include "kopetemessage.h"
 
 #include "kopete_export.h"
diff --git a/kopete/libkopete/kopetecontact.cpp b/kopete/libkopete/kopetecontact.cpp
index 28266e28..2c9e856c 100644
--- a/kopete/libkopete/kopetecontact.cpp
+++ b/kopete/libkopete/kopetecontact.cpp
@@ -29,9 +29,9 @@
 #include <kabcpersistence.h>
 #include <kdialogbase.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kmessagebox.h>
-#include <klistviewsearchline.h>
+#include <tdelistviewsearchline.h>
 
 #include "kopetecontactlist.h"
 #include "kopeteglobal.h"
@@ -51,7 +51,7 @@
 #include <tqimage.h>
 #include <tqmime.h>
 #include <tqvbox.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqcheckbox.h>
 #include <tqwhatsthis.h>
 #include <tqstylesheet.h>
diff --git a/kopete/libkopete/kopeteonlinestatusmanager.h b/kopete/libkopete/kopeteonlinestatusmanager.h
index 0ddd0745..d5011d51 100644
--- a/kopete/libkopete/kopeteonlinestatusmanager.h
+++ b/kopete/libkopete/kopeteonlinestatusmanager.h
@@ -21,7 +21,7 @@
 #include <tqobject.h>
 
 #include "kopeteonlinestatus.h"
-#include "kaction.h"
+#include "tdeaction.h"
 
 class TQString;
 class TQPixmap;
diff --git a/kopete/libkopete/kopeteprotocol.cpp b/kopete/libkopete/kopeteprotocol.cpp
index 1543b8d8..52d033bf 100644
--- a/kopete/libkopete/kopeteprotocol.cpp
+++ b/kopete/libkopete/kopeteprotocol.cpp
@@ -20,7 +20,7 @@
 #include "kopeteprotocol.h"
 
 #include <kdebug.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 
 #include <tqdict.h>
diff --git a/kopete/libkopete/private/kopetecommand.h b/kopete/libkopete/private/kopetecommand.h
index 177f3b80..5fc967a2 100644
--- a/kopete/libkopete/private/kopetecommand.h
+++ b/kopete/libkopete/private/kopetecommand.h
@@ -19,7 +19,7 @@
 #define __KOPETECOMMAND_H__
 
 #include <tqobject.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include "kopetecommandhandler.h"
 
 namespace Kopete
diff --git a/kopete/libkopete/ui/CMakeLists.txt b/kopete/libkopete/ui/CMakeLists.txt
index cb224847..d3016386 100644
--- a/kopete/libkopete/ui/CMakeLists.txt
+++ b/kopete/libkopete/ui/CMakeLists.txt
@@ -28,8 +28,8 @@ install( FILES
     addressbooklinkwidget.h kopetefileconfirmdialog.h
     kopetepasswordwidget.h kopeteview.h addcontactpage.h
     kopeteviewplugin.h editaccountwidget.h kopetecontactaction.h
-    kopetestdaction.h userinfodialog.h addressbookselectordialog.h
-    addressbookselectorwidget.h kopetelistview.h accountselector.h
+    kopetestdaction.h userinfodialog.h addressbootdeselectordialog.h
+    addressbootdeselectorwidget.h kopetelistview.h accountselector.h
     kopetelistviewitem.h kopetelistviewsearchline.h
     ${CMAKE_CURRENT_BINARY_DIR}/fileconfirmbase.h
     ${CMAKE_CURRENT_BINARY_DIR}/kopeteawaydialogbase.h
@@ -47,8 +47,8 @@ tde_add_library( kopeteui STATIC_PIC AUTOMOC
     kopetefileconfirmdialog.cpp fileconfirmbase.ui
     userinfodialog.cpp kopeteview.cpp kopetepasswordwidgetbase.ui
     kopetepasswordwidget.cpp accountselector.cpp kopeteviewplugin.cpp
-    addresseeitem.cpp addressbookselectorwidget_base.ui
-    addressbookselectordialog.cpp addressbookselectorwidget.cpp
+    addresseeitem.cpp addressbootdeselectorwidget_base.ui
+    addressbootdeselectordialog.cpp addressbootdeselectorwidget.cpp
     metacontactselectorwidget_base.ui metacontactselectorwidget.cpp
     kopetelistview.cpp kopetelistviewitem.cpp kopetelistviewsearchline.cpp
     contactaddednotifywidget.ui contactaddednotifydialog.cpp
diff --git a/kopete/libkopete/ui/Makefile.am b/kopete/libkopete/ui/Makefile.am
index 3e88846d..8bb377bb 100644
--- a/kopete/libkopete/ui/Makefile.am
+++ b/kopete/libkopete/ui/Makefile.am
@@ -8,8 +8,8 @@ libkopeteui_la_SOURCES = kopetecontactaction.cpp addcontactpage.cpp \
 			editaccountwidget.cpp kopetepassworddialog.ui kopetestdaction.cpp 	kopeteawaydialogbase.ui \
 		kopetefileconfirmdialog.cpp 	fileconfirmbase.ui userinfodialog.cpp kopeteview.cpp \
 		kopetepasswordwidgetbase.ui 	kopetepasswordwidget.cpp accountselector.cpp kopeteviewplugin.cpp \
-		addresseeitem.cpp addressbookselectorwidget_base.ui addressbookselectordialog.cpp \
-			addressbookselectorwidget.cpp metacontactselectorwidget_base.ui 	metacontactselectorwidget.cpp \
+		addresseeitem.cpp addressbootdeselectorwidget_base.ui addressbootdeselectordialog.cpp \
+			addressbootdeselectorwidget.cpp metacontactselectorwidget_base.ui 	metacontactselectorwidget.cpp \
 		kopetelistview.cpp kopetelistviewitem.cpp kopetelistviewsearchline.cpp \
 		contactaddednotifywidget.ui contactaddednotifydialog.cpp addressbooklinkwidget_base.ui \
 	addressbooklinkwidget.cpp
@@ -22,7 +22,7 @@ kopeteinclude_HEADERS = accountselector.h fileconfirmbase.h \
 	kopetefileconfirmdialog.h 	kopetepasswordwidget.h kopeteview.h addcontactpage.h \
 	kopeteawaydialogbase.h 	kopetepasswordwidgetbase.h kopeteviewplugin.h 	editaccountwidget.h \
 	kopetecontactaction.h kopetepassworddialog.h kopetestdaction.h 	userinfodialog.h \
-	addressbookselectordialog.h addressbookselectorwidget.h kopetelistview.h kopetelistviewitem.h \
+	addressbootdeselectordialog.h addressbootdeselectorwidget.h kopetelistview.h kopetelistviewitem.h \
 	kopetelistviewsearchline.h addressbooklinkwidget.h
 
 noinst_HEADERS = addresseeitem.h contactaddednotifywidget.h
diff --git a/kopete/libkopete/ui/accountselector.cpp b/kopete/libkopete/ui/accountselector.cpp
index f6cd3855..71b133e3 100644
--- a/kopete/libkopete/ui/accountselector.cpp
+++ b/kopete/libkopete/ui/accountselector.cpp
@@ -24,7 +24,7 @@
 #include <tqpixmap.h>
 
 #include <kdebug.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 class AccountListViewItem : public TDEListViewItem
 {
diff --git a/kopete/libkopete/ui/addressbooklinkwidget.cpp b/kopete/libkopete/ui/addressbooklinkwidget.cpp
index 31e04a52..877cfb4e 100644
--- a/kopete/libkopete/ui/addressbooklinkwidget.cpp
+++ b/kopete/libkopete/ui/addressbooklinkwidget.cpp
@@ -31,8 +31,8 @@
 #include <kopetemetacontact.h>
 
 #include "addressbooklinkwidget.h"
-#include "addressbookselectordialog.h"
-#include "addressbookselectorwidget.h"
+#include "addressbootdeselectordialog.h"
+#include "addressbootdeselectorwidget.h"
 
 namespace Kopete {
 namespace UI {
diff --git a/kopete/libkopete/ui/addressbootdeselectordialog.cpp b/kopete/libkopete/ui/addressbootdeselectordialog.cpp
index 44f42e2a..27560ef1 100644
--- a/kopete/libkopete/ui/addressbootdeselectordialog.cpp
+++ b/kopete/libkopete/ui/addressbootdeselectordialog.cpp
@@ -16,8 +16,8 @@
     *************************************************************************
 */
 
-#include "addressbookselectordialog.h"
-#include "addressbookselectorwidget.h"
+#include "addressbootdeselectordialog.h"
+#include "addressbootdeselectorwidget.h"
 #include <kdialogbase.h>
 #include <tqdialog.h>
 #include <tqlistview.h>
@@ -83,7 +83,7 @@ void AddressBookSelectorDialog::reject()
 } // namespace UI
 } // namespace Kopete
 
-#include "addressbookselectordialog.moc"
+#include "addressbootdeselectordialog.moc"
 
 // vim: set noet ts=4 sts=4 sw=4:
 
diff --git a/kopete/libkopete/ui/addressbootdeselectorwidget.cpp b/kopete/libkopete/ui/addressbootdeselectorwidget.cpp
index 16009ee5..d218fe1c 100644
--- a/kopete/libkopete/ui/addressbootdeselectorwidget.cpp
+++ b/kopete/libkopete/ui/addressbootdeselectorwidget.cpp
@@ -37,13 +37,13 @@
 #include <kpushbutton.h>
 #include <kactivelabel.h>
 #include <kdebug.h>
-#include <klistview.h>
-#include <klistviewsearchline.h>
+#include <tdelistview.h>
+#include <tdelistviewsearchline.h>
 #include <tqlabel.h>
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
 
-#include "addressbookselectorwidget.h"
+#include "addressbootdeselectorwidget.h"
 #include <addresseeitem.h>
 #include "kabcpersistence.h"
 
@@ -165,7 +165,7 @@ void AddressBookSelectorWidget::slotAddAddresseeClicked()
 } // namespace UI
 } // namespace Kopete
 
-#include "addressbookselectorwidget.moc"
+#include "addressbootdeselectorwidget.moc"
 
 // vim: set noet ts=4 sts=4 sw=4:
 
diff --git a/kopete/libkopete/ui/addressbootdeselectorwidget.h b/kopete/libkopete/ui/addressbootdeselectorwidget.h
index af4b1834..2a549e1c 100644
--- a/kopete/libkopete/ui/addressbootdeselectorwidget.h
+++ b/kopete/libkopete/ui/addressbootdeselectorwidget.h
@@ -33,7 +33,7 @@
 #include <kdemacros.h>
 #include "kopete_export.h"
 
-#include "addressbookselectorwidget_base.h"
+#include "addressbootdeselectorwidget_base.h"
 
 namespace KABC {
 		class AddressBook;
diff --git a/kopete/libkopete/ui/addressbootdeselectorwidget_base.ui b/kopete/libkopete/ui/addressbootdeselectorwidget_base.ui
index ee4c2016..fd046bf8 100644
--- a/kopete/libkopete/ui/addressbootdeselectorwidget_base.ui
+++ b/kopete/libkopete/ui/addressbootdeselectorwidget_base.ui
@@ -163,13 +163,13 @@
     </grid>
 </widget>
 <includes>
-    <include location="global" impldecl="in declaration">klistviewsearchline.h</include>
+    <include location="global" impldecl="in declaration">tdelistviewsearchline.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kactivelabel.h</includehint>
-    <includehint>klistview.h</includehint>
-    <includehint>klistviewsearchline.h</includehint>
+    <includehint>tdelistview.h</includehint>
+    <includehint>tdelistviewsearchline.h</includehint>
 </includehints>
 </UI>
diff --git a/kopete/libkopete/ui/addresseeitem.h b/kopete/libkopete/ui/addresseeitem.h
index 29546ebc..e0d8de53 100644
--- a/kopete/libkopete/ui/addresseeitem.h
+++ b/kopete/libkopete/ui/addresseeitem.h
@@ -25,7 +25,7 @@
 
 #include <kdialogbase.h>
 #include <klineedit.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include <kabc/addressbook.h>
 
diff --git a/kopete/libkopete/ui/contactaddednotifydialog.cpp b/kopete/libkopete/ui/contactaddednotifydialog.cpp
index 5b5e1e55..7a230e2c 100644
--- a/kopete/libkopete/ui/contactaddednotifydialog.cpp
+++ b/kopete/libkopete/ui/contactaddednotifydialog.cpp
@@ -38,7 +38,7 @@
 #include "kopetecontactlist.h"
 #include "kopetemetacontact.h"
 #include "addressbooklinkwidget.h"
-#include "addressbookselectordialog.h"
+#include "addressbootdeselectordialog.h"
 
 
 #include "contactaddednotifywidget.h"
diff --git a/kopete/libkopete/ui/kopetecontactaction.h b/kopete/libkopete/ui/kopetecontactaction.h
index 3b370916..ef5ba1b4 100644
--- a/kopete/libkopete/ui/kopetecontactaction.h
+++ b/kopete/libkopete/ui/kopetecontactaction.h
@@ -18,7 +18,7 @@
 #ifndef __kopetecontactaction_h__
 #define __kopetecontactaction_h__
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include "kopete_export.h"
 
 namespace Kopete
diff --git a/kopete/libkopete/ui/kopetelistview.h b/kopete/libkopete/ui/kopetelistview.h
index 98ae4b19..89671870 100644
--- a/kopete/libkopete/ui/kopetelistview.h
+++ b/kopete/libkopete/ui/kopetelistview.h
@@ -19,7 +19,7 @@
 #ifndef KOPETE_LISTVIEW_H
 #define KOPETE_LISTVIEW_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 namespace Kopete {
 namespace UI {
diff --git a/kopete/libkopete/ui/kopetelistviewitem.h b/kopete/libkopete/ui/kopetelistviewitem.h
index 871f1a6d..1e73e09f 100644
--- a/kopete/libkopete/ui/kopetelistviewitem.h
+++ b/kopete/libkopete/ui/kopetelistviewitem.h
@@ -19,7 +19,7 @@
 #ifndef KOPETE_LISTVIEWITEM_H
 #define KOPETE_LISTVIEWITEM_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kopetecontact.h>
 
 #include <utility>
diff --git a/kopete/libkopete/ui/kopetelistviewsearchline.h b/kopete/libkopete/ui/kopetelistviewsearchline.h
index 70b419d5..0ad5637a 100644
--- a/kopete/libkopete/ui/kopetelistviewsearchline.h
+++ b/kopete/libkopete/ui/kopetelistviewsearchline.h
@@ -18,7 +18,7 @@
 #ifndef KOPETELISTVIEWSEARCHLINE_H
 #define KOPETELISTVIEWSEARCHLINE_H
 
-#include <klistviewsearchline.h>
+#include <tdelistviewsearchline.h>
 
 namespace Kopete {
 namespace UI {
diff --git a/kopete/libkopete/ui/kopetestdaction.h b/kopete/libkopete/ui/kopetestdaction.h
index 376548b9..9040afae 100644
--- a/kopete/libkopete/ui/kopetestdaction.h
+++ b/kopete/libkopete/ui/kopetestdaction.h
@@ -20,7 +20,7 @@
 #define KOPETESTDACTION_H
 
 #undef KDE_NO_COMPAT
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tqobject.h>
 
 #include "kopete_export.h"
diff --git a/kopete/libkopete/ui/metacontactselectorwidget.cpp b/kopete/libkopete/ui/metacontactselectorwidget.cpp
index 26b075a3..18580b7a 100644
--- a/kopete/libkopete/ui/metacontactselectorwidget.cpp
+++ b/kopete/libkopete/ui/metacontactselectorwidget.cpp
@@ -36,8 +36,8 @@
 #include <kpushbutton.h>
 #include <kactivelabel.h>
 #include <kdebug.h>
-#include <klistview.h>
-#include <klistviewsearchline.h>
+#include <tdelistview.h>
+#include <tdelistviewsearchline.h>
 
 #include "kopetelistview.h"
 #include "kopetelistviewsearchline.h"
diff --git a/kopete/plugins/alias/aliasdialog.ui b/kopete/plugins/alias/aliasdialog.ui
index 6e52c0ce..47e7e9b6 100644
--- a/kopete/plugins/alias/aliasdialog.ui
+++ b/kopete/plugins/alias/aliasdialog.ui
@@ -188,6 +188,6 @@ Do not include the '/' in the command (if you do it will be stripped off anyway)
     <includehint>klineedit.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/kopete/plugins/alias/aliasdialogbase.ui b/kopete/plugins/alias/aliasdialogbase.ui
index 2bdc2e77..0297c6ff 100644
--- a/kopete/plugins/alias/aliasdialogbase.ui
+++ b/kopete/plugins/alias/aliasdialogbase.ui
@@ -99,7 +99,7 @@
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/kopete/plugins/alias/aliaspreferences.cpp b/kopete/plugins/alias/aliaspreferences.cpp
index f81da475..6b91418d 100644
--- a/kopete/plugins/alias/aliaspreferences.cpp
+++ b/kopete/plugins/alias/aliaspreferences.cpp
@@ -8,7 +8,7 @@
  ***************************************************************************/
 
 #include <kpushbutton.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <klineedit.h>
 #include <kglobal.h>
diff --git a/kopete/plugins/alias/editaliasdialog.cpp b/kopete/plugins/alias/editaliasdialog.cpp
index 6acdf153..2408c6d3 100644
--- a/kopete/plugins/alias/editaliasdialog.cpp
+++ b/kopete/plugins/alias/editaliasdialog.cpp
@@ -21,7 +21,7 @@
 #include <tqwidget.h>
 #include <tqstring.h>
 #include <klineedit.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 
 EditAliasDialog::EditAliasDialog( TQWidget* parent, const char* name )
diff --git a/kopete/plugins/contactnotes/contactnotesplugin.cpp b/kopete/plugins/contactnotes/contactnotesplugin.cpp
index db3d1302..51977e4e 100644
--- a/kopete/plugins/contactnotes/contactnotesplugin.cpp
+++ b/kopete/plugins/contactnotes/contactnotesplugin.cpp
@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
 
diff --git a/kopete/plugins/cryptography/cryptographyguiclient.cpp b/kopete/plugins/cryptography/cryptographyguiclient.cpp
index df66c608..d8cafd85 100644
--- a/kopete/plugins/cryptography/cryptographyguiclient.cpp
+++ b/kopete/plugins/cryptography/cryptographyguiclient.cpp
@@ -20,7 +20,7 @@
 #include "kopetecontact.h"
 #include "kopetechatsession.h"
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdeconfig.h>
 #include <klocale.h>
 #include <kgenericfactory.h>
diff --git a/kopete/plugins/cryptography/cryptographyplugin.cpp b/kopete/plugins/cryptography/cryptographyplugin.cpp
index 1085da9c..e402567c 100644
--- a/kopete/plugins/cryptography/cryptographyplugin.cpp
+++ b/kopete/plugins/cryptography/cryptographyplugin.cpp
@@ -20,7 +20,7 @@
 #include <tqregexp.h>
 
 #include <kdebug.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdeconfig.h>
 #include <kgenericfactory.h>
 #include <tdeversion.h>
diff --git a/kopete/plugins/cryptography/kgpgselkey.cpp b/kopete/plugins/cryptography/kgpgselkey.cpp
index 63d26510..e0a03cf8 100644
--- a/kopete/plugins/cryptography/kgpgselkey.cpp
+++ b/kopete/plugins/cryptography/kgpgselkey.cpp
@@ -26,7 +26,7 @@
 #include <tqlayout.h>
 #include <tqlabel.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <tqcheckbox.h>
 #include <kprocess.h>
diff --git a/kopete/plugins/cryptography/popuppublic.cpp b/kopete/plugins/cryptography/popuppublic.cpp
index 7764d3b3..76151f57 100644
--- a/kopete/plugins/cryptography/popuppublic.cpp
+++ b/kopete/plugins/cryptography/popuppublic.cpp
@@ -32,14 +32,14 @@
 #include <tqlabel.h>
 
 #include <tdeversion.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kprocess.h>
 #include <kprocio.h>
 #include <klocale.h>
-#include <kaccel.h>
-#include <klistviewsearchline.h>
+#include <tdeaccel.h>
+#include <tdelistviewsearchline.h>
 #include <kactivelabel.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <klineedit.h>
@@ -52,7 +52,7 @@
 //#include "kgpg.h"
 #include "kgpginterface.h"
 
-/////////////////   klistviewitem special
+/////////////////   tdelistviewitem special
 
 class UpdateViewItem2 : public TDEListViewItem
 {
diff --git a/kopete/plugins/cryptography/popuppublic.h b/kopete/plugins/cryptography/popuppublic.h
index 83ac5102..547f8483 100644
--- a/kopete/plugins/cryptography/popuppublic.h
+++ b/kopete/plugins/cryptography/popuppublic.h
@@ -22,7 +22,7 @@
 #include <kdialogbase.h>
 
 //#include <kiconloader.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 
 
 class TQPushButton;
diff --git a/kopete/plugins/highlight/highlightpreferences.cpp b/kopete/plugins/highlight/highlightpreferences.cpp
index 875a0dee..34a7a1cc 100644
--- a/kopete/plugins/highlight/highlightpreferences.cpp
+++ b/kopete/plugins/highlight/highlightpreferences.cpp
@@ -22,7 +22,7 @@
 #include <klineedit.h>
 #include <tdeparts/componentfactory.h>
 #include <klocale.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kgenericfactory.h>
 #include <kcolorbutton.h>
 #include <kinputdialog.h>
diff --git a/kopete/plugins/highlight/highlightprefsbase.ui b/kopete/plugins/highlight/highlightprefsbase.ui
index b820151d..fa7cc9e1 100644
--- a/kopete/plugins/highlight/highlightprefsbase.ui
+++ b/kopete/plugins/highlight/highlightprefsbase.ui
@@ -454,7 +454,7 @@
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>klineedit.h</includehint>
     <includehint>kcombobox.h</includehint>
     <includehint>kcolorbutton.h</includehint>
diff --git a/kopete/plugins/history/historydialog.cpp b/kopete/plugins/history/historydialog.cpp
index 992d586f..b5b65b80 100644
--- a/kopete/plugins/history/historydialog.cpp
+++ b/kopete/plugins/history/historydialog.cpp
@@ -48,14 +48,14 @@
 #include <klocale.h>
 #include <krun.h>
 #include <kstandarddirs.h>
-#include <klistview.h>
-#include <klistviewsearchline.h>
+#include <tdelistview.h>
+#include <tdelistviewsearchline.h>
 #include <kprogress.h>
 #include <kiconloader.h>
 #include <kcombobox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstdaction.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 class TDEListViewDateItem : public TDEListViewItem
 {
diff --git a/kopete/plugins/history/historydialog.h b/kopete/plugins/history/historydialog.h
index daa45362..7efea5fa 100644
--- a/kopete/plugins/history/historydialog.h
+++ b/kopete/plugins/history/historydialog.h
@@ -23,7 +23,7 @@
 #include <tqstringlist.h>
 
 #include <kdialogbase.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include "kopetemessage.h"
 
diff --git a/kopete/plugins/history/historyguiclient.cpp b/kopete/plugins/history/historyguiclient.cpp
index 21bde3b5..eeda505c 100644
--- a/kopete/plugins/history/historyguiclient.cpp
+++ b/kopete/plugins/history/historyguiclient.cpp
@@ -21,7 +21,7 @@
 #include "kopetecontact.h"
 #include "kopeteview.h"
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 #include <kgenericfactory.h>
 
diff --git a/kopete/plugins/history/historyplugin.cpp b/kopete/plugins/history/historyplugin.cpp
index d4791952..83405ee2 100644
--- a/kopete/plugins/history/historyplugin.cpp
+++ b/kopete/plugins/history/historyplugin.cpp
@@ -17,7 +17,7 @@
 
 #include <kgenericfactory.h>
 #include <kaboutdata.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kmessagebox.h>
 //#include <tdeconfig.h>
 #include <kplugininfo.h>
diff --git a/kopete/plugins/history/historyviewer.ui b/kopete/plugins/history/historyviewer.ui
index 6711dd31..be64272d 100644
--- a/kopete/plugins/history/historyviewer.ui
+++ b/kopete/plugins/history/historyviewer.ui
@@ -340,8 +340,8 @@
 <includehints>
     <includehint>kprogress.h</includehint>
     <includehint>klineedit.h</includehint>
-    <includehint>klistviewsearchline.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistviewsearchline.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kcombobox.h</includehint>
 </includehints>
 </UI>
diff --git a/kopete/plugins/latex/latexguiclient.cpp b/kopete/plugins/latex/latexguiclient.cpp
index 7b67f119..d62be944 100644
--- a/kopete/plugins/latex/latexguiclient.cpp
+++ b/kopete/plugins/latex/latexguiclient.cpp
@@ -19,7 +19,7 @@
 
 #include <tqvariant.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <tqimage.h>
diff --git a/kopete/plugins/netmeeting/netmeetingguiclient.cpp b/kopete/plugins/netmeeting/netmeetingguiclient.cpp
index d01d0df0..e47386a2 100644
--- a/kopete/plugins/netmeeting/netmeetingguiclient.cpp
+++ b/kopete/plugins/netmeeting/netmeetingguiclient.cpp
@@ -20,7 +20,7 @@
 #include <tqvariant.h>
 
 #include <kdebug.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 #include <kgenericfactory.h>
 
diff --git a/kopete/plugins/netmeeting/netmeetingplugin.cpp b/kopete/plugins/netmeeting/netmeetingplugin.cpp
index 2f76b09a..eaf777dd 100644
--- a/kopete/plugins/netmeeting/netmeetingplugin.cpp
+++ b/kopete/plugins/netmeeting/netmeetingplugin.cpp
@@ -17,7 +17,7 @@
 
 #include <kdebug.h>
 #include <kgenericfactory.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdeversion.h>
 #include <kaboutdata.h>
 
diff --git a/kopete/plugins/netmeeting/netmeetingpreferences.cpp b/kopete/plugins/netmeeting/netmeetingpreferences.cpp
index 3c63bc7e..207fd6cd 100644
--- a/kopete/plugins/netmeeting/netmeetingpreferences.cpp
+++ b/kopete/plugins/netmeeting/netmeetingpreferences.cpp
@@ -24,7 +24,7 @@
 #include <tdeconfig.h>
 #include <kglobal.h>
 #include <kcombobox.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kgenericfactory.h>
 #include <kcolorbutton.h>
 #include <kinputdialog.h>
diff --git a/kopete/plugins/nowlistening/nowlisteningguiclient.cpp b/kopete/plugins/nowlistening/nowlisteningguiclient.cpp
index 29f03175..702bdeca 100644
--- a/kopete/plugins/nowlistening/nowlisteningguiclient.cpp
+++ b/kopete/plugins/nowlistening/nowlisteningguiclient.cpp
@@ -25,7 +25,7 @@
 #include "kopeteview.h"
 
 #include <kdebug.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 
diff --git a/kopete/plugins/nowlistening/nowlisteningplugin.cpp b/kopete/plugins/nowlistening/nowlisteningplugin.cpp
index 1f1fed51..3ab8539b 100644
--- a/kopete/plugins/nowlistening/nowlisteningplugin.cpp
+++ b/kopete/plugins/nowlistening/nowlisteningplugin.cpp
@@ -27,7 +27,7 @@
 #include <kgenericfactory.h>
 #include <kapplication.h>
 #include <dcopclient.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include "config.h"
 #include "kopetechatsessionmanager.h"
diff --git a/kopete/plugins/nowlistening/nowlisteningpreferences.cpp b/kopete/plugins/nowlistening/nowlisteningpreferences.cpp
index d7117852..47eb51b4 100644
--- a/kopete/plugins/nowlistening/nowlisteningpreferences.cpp
+++ b/kopete/plugins/nowlistening/nowlisteningpreferences.cpp
@@ -22,7 +22,7 @@
 #include <tqlayout.h>
 #include <tqradiobutton.h>
 
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <klocale.h>
 #include <kgenericfactory.h>
 
diff --git a/kopete/plugins/nowlistening/nowlisteningprefs.ui b/kopete/plugins/nowlistening/nowlisteningprefs.ui
index ff3307e9..3fb6a340 100644
--- a/kopete/plugins/nowlistening/nowlisteningprefs.ui
+++ b/kopete/plugins/nowlistening/nowlisteningprefs.ui
@@ -371,6 +371,6 @@ in place of your status message.</string>
 </connections>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
 </includehints>
 </UI>
diff --git a/kopete/plugins/smpppdcs/smpppdcspreferences.cpp b/kopete/plugins/smpppdcs/smpppdcspreferences.cpp
index 1815fe9e..e91a6cc4 100644
--- a/kopete/plugins/smpppdcs/smpppdcspreferences.cpp
+++ b/kopete/plugins/smpppdcs/smpppdcspreferences.cpp
@@ -18,7 +18,7 @@
 #include <tqregexp.h>
 #include <tqradiobutton.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klineedit.h>
 #include <knuminput.h>
 #include <kgenericfactory.h>
diff --git a/kopete/plugins/smpppdcs/smpppdcsprefs.ui b/kopete/plugins/smpppdcs/smpppdcsprefs.ui
index 747398d4..3aa91695 100644
--- a/kopete/plugins/smpppdcs/smpppdcsprefs.ui
+++ b/kopete/plugins/smpppdcs/smpppdcsprefs.ui
@@ -279,6 +279,6 @@
 <includehints>
     <includehint>kpushbutton.h</includehint>
     <includehint>smpppdlocationwidget.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/kopete/plugins/statistics/statisticsdb.cpp b/kopete/plugins/statistics/statisticsdb.cpp
index 0862d22b..6082158c 100644
--- a/kopete/plugins/statistics/statisticsdb.cpp
+++ b/kopete/plugins/statistics/statisticsdb.cpp
@@ -20,7 +20,7 @@
 
 #include <kgenericfactory.h>
 #include <kaboutdata.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
diff --git a/kopete/plugins/statistics/statisticsdialog.cpp b/kopete/plugins/statistics/statisticsdialog.cpp
index 27c8b565..fb7ac6d8 100644
--- a/kopete/plugins/statistics/statisticsdialog.cpp
+++ b/kopete/plugins/statistics/statisticsdialog.cpp
@@ -25,7 +25,7 @@
 
 #include "kdialogbase.h"
 #include "klocale.h"
-#include "klistview.h"
+#include "tdelistview.h"
 #include "tdehtml_part.h"
 #include "kstandarddirs.h"
 #include "kdatepicker.h"
diff --git a/kopete/plugins/statistics/statisticsplugin.cpp b/kopete/plugins/statistics/statisticsplugin.cpp
index 14490e30..c5da24bb 100644
--- a/kopete/plugins/statistics/statisticsplugin.cpp
+++ b/kopete/plugins/statistics/statisticsplugin.cpp
@@ -20,7 +20,7 @@
 
 #include <kgenericfactory.h>
 #include <kaboutdata.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
 #include <tdeversion.h>
diff --git a/kopete/plugins/texteffect/texteffectprefs.ui b/kopete/plugins/texteffect/texteffectprefs.ui
index 2278c2a5..e93ae0fd 100644
--- a/kopete/plugins/texteffect/texteffectprefs.ui
+++ b/kopete/plugins/texteffect/texteffectprefs.ui
@@ -226,6 +226,6 @@
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
 </includehints>
 </UI>
diff --git a/kopete/plugins/translator/translatorguiclient.cpp b/kopete/plugins/translator/translatorguiclient.cpp
index 1d1eaec8..0a2e8ed2 100644
--- a/kopete/plugins/translator/translatorguiclient.cpp
+++ b/kopete/plugins/translator/translatorguiclient.cpp
@@ -20,7 +20,7 @@
 #include <tqvariant.h>
 
 #include <kdebug.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 
 #include "kopetechatsession.h"
diff --git a/kopete/plugins/translator/translatorplugin.cpp b/kopete/plugins/translator/translatorplugin.cpp
index 5113e358..6b8cb61d 100644
--- a/kopete/plugins/translator/translatorplugin.cpp
+++ b/kopete/plugins/translator/translatorplugin.cpp
@@ -26,7 +26,7 @@
 #include <tqstring.h>
 
 #include <kdebug.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kgenericfactory.h>
 #include <kglobal.h>
 #include <tdeconfig.h>
diff --git a/kopete/protocols/gadu/gaduaccount.cpp b/kopete/protocols/gadu/gaduaccount.cpp
index 542211f5..5ca54870 100644
--- a/kopete/protocols/gadu/gaduaccount.cpp
+++ b/kopete/protocols/gadu/gaduaccount.cpp
@@ -40,7 +40,7 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kmessagebox.h>
 #include <knotifyclient.h>
 #include <ktempfile.h>
diff --git a/kopete/protocols/gadu/gaduaccount.h b/kopete/protocols/gadu/gaduaccount.h
index 37e53a7b..b57ad015 100644
--- a/kopete/protocols/gadu/gaduaccount.h
+++ b/kopete/protocols/gadu/gaduaccount.h
@@ -36,7 +36,7 @@
 #include <tqmap.h>
 #include <tqstring.h>
 #include <tqptrlist.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdefiledialog.h>
 
 class GaduAccountPrivate;
diff --git a/kopete/protocols/gadu/gaducontact.cpp b/kopete/protocols/gadu/gaducontact.cpp
index e797ea40..bedb3f55 100644
--- a/kopete/protocols/gadu/gaducontact.cpp
+++ b/kopete/protocols/gadu/gaducontact.cpp
@@ -21,7 +21,7 @@
 // 02110-1301, USA.
 
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <tdefiledialog.h>
 #include <kmessagebox.h>
diff --git a/kopete/protocols/gadu/gadupubdir.cpp b/kopete/protocols/gadu/gadupubdir.cpp
index fc496aaa..92f53b48 100644
--- a/kopete/protocols/gadu/gadupubdir.cpp
+++ b/kopete/protocols/gadu/gadupubdir.cpp
@@ -37,7 +37,7 @@
 #include <kcombobox.h>
 #include <krestrictedline.h>
 #include <klineedit.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 
 GaduPublicDir::GaduPublicDir( GaduAccount* account, TQWidget* parent, const char* name )
diff --git a/kopete/protocols/gadu/ui/gadusearch.ui b/kopete/protocols/gadu/ui/gadusearch.ui
index 5fe042ad..4c40ae13 100644
--- a/kopete/protocols/gadu/ui/gadusearch.ui
+++ b/kopete/protocols/gadu/ui/gadusearch.ui
@@ -687,6 +687,6 @@
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>krestrictedline.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/kopete/protocols/groupwise/gwaccount.h b/kopete/protocols/groupwise/gwaccount.h
index abce33be..91caa1ab 100644
--- a/kopete/protocols/groupwise/gwaccount.h
+++ b/kopete/protocols/groupwise/gwaccount.h
@@ -21,7 +21,7 @@
 #ifndef GW_ACCOUNT_H
 #define GW_ACCOUNT_H
 
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include <kopetechatsessionmanager.h>
 
diff --git a/kopete/protocols/groupwise/gwcontact.cpp b/kopete/protocols/groupwise/gwcontact.cpp
index b225162a..3bc505d7 100644
--- a/kopete/protocols/groupwise/gwcontact.cpp
+++ b/kopete/protocols/groupwise/gwcontact.cpp
@@ -27,7 +27,7 @@
 
 #include <tqmap.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <klocale.h>
 
diff --git a/kopete/protocols/groupwise/gwmessagemanager.cpp b/kopete/protocols/groupwise/gwmessagemanager.cpp
index eef88a7b..583c525f 100644
--- a/kopete/protocols/groupwise/gwmessagemanager.cpp
+++ b/kopete/protocols/groupwise/gwmessagemanager.cpp
@@ -17,10 +17,10 @@
 #include <kiconloader.h>
 #include <kinputdialog.h>
 #include <klocale.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
-#include <kshortcut.h>
+#include <tdepopupmenu.h>
+#include <tdeshortcut.h>
 
 #include <kopetecontact.h>
 #include <kopetecontactaction.h>
diff --git a/kopete/protocols/groupwise/ui/gwchatpropswidget.ui b/kopete/protocols/groupwise/ui/gwchatpropswidget.ui
index 7977ce04..23388b30 100644
--- a/kopete/protocols/groupwise/ui/gwchatpropswidget.ui
+++ b/kopete/protocols/groupwise/ui/gwchatpropswidget.ui
@@ -386,7 +386,7 @@
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/kopete/protocols/groupwise/ui/gwchatsearchdialog.cpp b/kopete/protocols/groupwise/ui/gwchatsearchdialog.cpp
index b9021b1f..8d61cda1 100644
--- a/kopete/protocols/groupwise/ui/gwchatsearchdialog.cpp
+++ b/kopete/protocols/groupwise/ui/gwchatsearchdialog.cpp
@@ -18,8 +18,8 @@
 
 #include <tqmap.h>
 
-#include <klistview.h>
-#include <klistviewsearchline.h>
+#include <tdelistview.h>
+#include <tdelistviewsearchline.h>
 
 #include <kpushbutton.h>
 #include <kdebug.h>
diff --git a/kopete/protocols/groupwise/ui/gwchatsearchwidget.ui b/kopete/protocols/groupwise/ui/gwchatsearchwidget.ui
index 86fdd734..0d69e76d 100644
--- a/kopete/protocols/groupwise/ui/gwchatsearchwidget.ui
+++ b/kopete/protocols/groupwise/ui/gwchatsearchwidget.ui
@@ -110,7 +110,7 @@
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
 </includehints>
 </UI>
diff --git a/kopete/protocols/groupwise/ui/gwcontactproperties.cpp b/kopete/protocols/groupwise/ui/gwcontactproperties.cpp
index 27fe81fb..53ec8224 100644
--- a/kopete/protocols/groupwise/ui/gwcontactproperties.cpp
+++ b/kopete/protocols/groupwise/ui/gwcontactproperties.cpp
@@ -20,7 +20,7 @@
 #include <tqheader.h>
 #include <tqlabel.h>
 #include <tqlineedit.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqmap.h>
 #include <tqpopupmenu.h>
 
@@ -32,7 +32,7 @@
 #include <kopeteonlinestatus.h>
 #include <kopetemetacontact.h>
 #include <kopeteuiglobal.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 
 #include "gwcontact.h"
diff --git a/kopete/protocols/groupwise/ui/gwcontactpropswidget.ui b/kopete/protocols/groupwise/ui/gwcontactpropswidget.ui
index 8113c238..305924b0 100644
--- a/kopete/protocols/groupwise/ui/gwcontactpropswidget.ui
+++ b/kopete/protocols/groupwise/ui/gwcontactpropswidget.ui
@@ -206,6 +206,6 @@
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/kopete/protocols/groupwise/ui/gwcustomstatuswidget.ui b/kopete/protocols/groupwise/ui/gwcustomstatuswidget.ui
index 9164d68d..4a685311 100644
--- a/kopete/protocols/groupwise/ui/gwcustomstatuswidget.ui
+++ b/kopete/protocols/groupwise/ui/gwcustomstatuswidget.ui
@@ -107,6 +107,6 @@
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/kopete/protocols/irc/ircaccount.cpp b/kopete/protocols/irc/ircaccount.cpp
index 3c8c5b85..9a316854 100644
--- a/kopete/protocols/irc/ircaccount.cpp
+++ b/kopete/protocols/irc/ircaccount.cpp
@@ -40,7 +40,7 @@
 #include "kopeteview.h"
 #include "kopetepassword.h"
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kaboutdata.h>
 #include <kapplication.h>
 #include <tdeconfig.h>
@@ -52,7 +52,7 @@
 #include <klineeditdlg.h>
 #include <kmessagebox.h>
 #include <knotifyclient.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include <tqlayout.h>
 #include <tqtimer.h>
diff --git a/kopete/protocols/irc/ircguiclient.cpp b/kopete/protocols/irc/ircguiclient.cpp
index 702aafa9..3724781d 100644
--- a/kopete/protocols/irc/ircguiclient.cpp
+++ b/kopete/protocols/irc/ircguiclient.cpp
@@ -18,13 +18,13 @@
 
 #include <tdeversion.h>
 #if KDE_IS_VERSION( 3, 1, 90 )
-	#include <kactioncollection.h>
+	#include <tdeactioncollection.h>
 #else
 // ------------------------------------------------------------
 // TODO: UGLY HACK, remove when we drop KDE 3.1 compatibility
 #ifdef KDE_NO_COMPAT
 #undef KDE_NO_COMPAT
-#include <kaction.h>
+#include <tdeaction.h>
 #define KDE_NO_COMPAT 1
 #endif
 // ------------------------------------------------------------
diff --git a/kopete/protocols/irc/ircprotocol.cpp b/kopete/protocols/irc/ircprotocol.cpp
index 2f39a329..9c6b9df4 100644
--- a/kopete/protocols/irc/ircprotocol.cpp
+++ b/kopete/protocols/irc/ircprotocol.cpp
@@ -41,7 +41,7 @@
 #include "kopeteuiglobal.h"
 
 #undef KDE_NO_COMPAT
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcharsets.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
diff --git a/kopete/protocols/irc/ircservercontact.cpp b/kopete/protocols/irc/ircservercontact.cpp
index 5be40dff..e5018ccd 100644
--- a/kopete/protocols/irc/ircservercontact.cpp
+++ b/kopete/protocols/irc/ircservercontact.cpp
@@ -24,7 +24,7 @@
 #include "kopetechatsessionmanager.h"
 #include "kopeteview.h"
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <klocale.h>
 
diff --git a/kopete/protocols/irc/ircusercontact.cpp b/kopete/protocols/irc/ircusercontact.cpp
index 03806208..07515c75 100644
--- a/kopete/protocols/irc/ircusercontact.cpp
+++ b/kopete/protocols/irc/ircusercontact.cpp
@@ -26,7 +26,7 @@
 #include "kopetemetacontact.h"
 #include "kopeteview.h"
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <tdefiledialog.h>
 #include <klocale.h>
diff --git a/kopete/protocols/irc/kcodecaction.h b/kopete/protocols/irc/kcodecaction.h
index e581e713..769ce324 100644
--- a/kopete/protocols/irc/kcodecaction.h
+++ b/kopete/protocols/irc/kcodecaction.h
@@ -21,9 +21,9 @@
 #include <tqintdict.h>
 
 #if KDE_IS_VERSION( 3, 1, 90 )
-	#include <kactionclasses.h>
+	#include <tdeactionclasses.h>
 #else
-	#include <kaction.h>
+	#include <tdeaction.h>
 #endif
 
 class KCodecAction : public TDESelectAction
diff --git a/kopete/protocols/irc/ui/channellist.cpp b/kopete/protocols/irc/ui/channellist.cpp
index 2d4e357b..6f26b0e4 100644
--- a/kopete/protocols/irc/ui/channellist.cpp
+++ b/kopete/protocols/irc/ui/channellist.cpp
@@ -31,7 +31,7 @@
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
 #include <tqheader.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqlayout.h>
 #include <tqtooltip.h>
 #include <tqtimer.h>
diff --git a/kopete/protocols/irc/ui/irceditaccount.ui b/kopete/protocols/irc/ui/irceditaccount.ui
index 4b308655..8bdb552a 100644
--- a/kopete/protocols/irc/ui/irceditaccount.ui
+++ b/kopete/protocols/irc/ui/irceditaccount.ui
@@ -1017,6 +1017,6 @@
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/kopete/protocols/irc/ui/irceditaccountwidget.cpp b/kopete/protocols/irc/ui/irceditaccountwidget.cpp
index 12784ae5..0b357726 100644
--- a/kopete/protocols/irc/ui/irceditaccountwidget.cpp
+++ b/kopete/protocols/irc/ui/irceditaccountwidget.cpp
@@ -29,7 +29,7 @@
 
 #include <kmessagebox.h>
 #include <klocale.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kdebug.h>
 #include <kextsock.h>
 #include <tdeconfig.h>
diff --git a/kopete/protocols/jabber/jabberbookmarks.cpp b/kopete/protocols/jabber/jabberbookmarks.cpp
index 54a17943..8167a1c7 100644
--- a/kopete/protocols/jabber/jabberbookmarks.cpp
+++ b/kopete/protocols/jabber/jabberbookmarks.cpp
@@ -20,7 +20,7 @@
 
 
 #include <kdebug.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 
 #include "xmpp_tasks.h"
diff --git a/kopete/protocols/jabber/jabbercontact.cpp b/kopete/protocols/jabber/jabbercontact.cpp
index 708d9f16..54dc25d9 100644
--- a/kopete/protocols/jabber/jabbercontact.cpp
+++ b/kopete/protocols/jabber/jabbercontact.cpp
@@ -32,7 +32,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <tdefiledialog.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kstandarddirs.h>
 #include <tdeio/netaccess.h>
diff --git a/kopete/protocols/jabber/jabberprotocol.cpp b/kopete/protocols/jabber/jabberprotocol.cpp
index 9e9cdc9a..4de868a7 100644
--- a/kopete/protocols/jabber/jabberprotocol.cpp
+++ b/kopete/protocols/jabber/jabberprotocol.cpp
@@ -22,7 +22,7 @@
 #include <tdeconfig.h>
 #include <kmessagebox.h>
 #include <kiconloader.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <klineeditdlg.h>
 
diff --git a/kopete/protocols/jabber/jabberprotocol.h b/kopete/protocols/jabber/jabberprotocol.h
index 117b683c..8fdec271 100644
--- a/kopete/protocols/jabber/jabberprotocol.h
+++ b/kopete/protocols/jabber/jabberprotocol.h
@@ -24,8 +24,8 @@
 #include <tqmap.h>
 #include <tqpixmap.h>
 #include <tqmovie.h>
-#include <kaction.h>
-#include <kpopupmenu.h>
+#include <tdeaction.h>
+#include <tdepopupmenu.h>
 
 #include "kopetecontact.h"
 #include "kopetecontactproperty.h"
diff --git a/kopete/protocols/jabber/jabbertransport.cpp b/kopete/protocols/jabber/jabbertransport.cpp
index 6b658b2c..94bbb5b2 100644
--- a/kopete/protocols/jabber/jabbertransport.cpp
+++ b/kopete/protocols/jabber/jabbertransport.cpp
@@ -31,7 +31,7 @@
 
 #include <tqpixmap.h>
 #include <tqtimer.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <tdeconfig.h>
diff --git a/kopete/protocols/meanwhile/meanwhileaccount.cpp b/kopete/protocols/meanwhile/meanwhileaccount.cpp
index 91635c91..7350b425 100644
--- a/kopete/protocols/meanwhile/meanwhileaccount.cpp
+++ b/kopete/protocols/meanwhile/meanwhileaccount.cpp
@@ -25,8 +25,8 @@
 #include "kopetecontactlist.h"
 #include "kopetepassword.h"
 
-#include <kaction.h>
-#include <kpopupmenu.h>
+#include <tdeaction.h>
+#include <tdepopupmenu.h>
 #include <klocale.h>
 #include <tdeconfigbase.h>
 #include "kopeteaway.h"
diff --git a/kopete/protocols/meanwhile/meanwhilecontact.cpp b/kopete/protocols/meanwhile/meanwhilecontact.cpp
index e77d470a..e594dd57 100644
--- a/kopete/protocols/meanwhile/meanwhilecontact.cpp
+++ b/kopete/protocols/meanwhile/meanwhilecontact.cpp
@@ -15,7 +15,7 @@
     *************************************************************************
 */
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <klocale.h>
 
diff --git a/kopete/protocols/meanwhile/meanwhileplugin.h b/kopete/protocols/meanwhile/meanwhileplugin.h
index c11a2b2f..15959124 100644
--- a/kopete/protocols/meanwhile/meanwhileplugin.h
+++ b/kopete/protocols/meanwhile/meanwhileplugin.h
@@ -18,7 +18,7 @@
 #define __MEANWHILE_PLUGIN_H__
 
 #include "tqstring.h"
-#include <kaction.h>
+#include <tdeaction.h>
 
 class TQLineEdit;
 
diff --git a/kopete/protocols/msn/msnaccount.cpp b/kopete/protocols/msn/msnaccount.cpp
index 30f8d477..6c7dbb41 100644
--- a/kopete/protocols/msn/msnaccount.cpp
+++ b/kopete/protocols/msn/msnaccount.cpp
@@ -21,12 +21,12 @@
 
 #include <config.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kinputdialog.h>
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <kmdcodec.h>
 #include <klocale.h>
diff --git a/kopete/protocols/msn/msnchatsession.cpp b/kopete/protocols/msn/msnchatsession.cpp
index e4ee3c06..6137e17b 100644
--- a/kopete/protocols/msn/msnchatsession.cpp
+++ b/kopete/protocols/msn/msnchatsession.cpp
@@ -29,10 +29,10 @@
 #include <kinputdialog.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <ktempfile.h>
-#include <kmainwindow.h>
-#include <ktoolbar.h>
+#include <tdemainwindow.h>
+#include <tdetoolbar.h>
 #include <krun.h>
 
 #include "kopetecontactaction.h"
diff --git a/kopete/protocols/msn/msncontact.cpp b/kopete/protocols/msn/msncontact.cpp
index dcfc8ce7..25041d72 100644
--- a/kopete/protocols/msn/msncontact.cpp
+++ b/kopete/protocols/msn/msncontact.cpp
@@ -24,7 +24,7 @@
 #include <tqcheckbox.h>
 
 #undef KDE_NO_COMPAT
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <tdefiledialog.h>
 #include <klineedit.h>
diff --git a/kopete/protocols/oscar/aim/aimaccount.cpp b/kopete/protocols/oscar/aim/aimaccount.cpp
index cd9e30a3..37bfb1dc 100644
--- a/kopete/protocols/oscar/aim/aimaccount.cpp
+++ b/kopete/protocols/oscar/aim/aimaccount.cpp
@@ -20,7 +20,7 @@
 #include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kmessagebox.h>
 #include <kmdcodec.h>
 
diff --git a/kopete/protocols/oscar/aim/aimcontact.cpp b/kopete/protocols/oscar/aim/aimcontact.cpp
index 2a8b0320..29cd585a 100644
--- a/kopete/protocols/oscar/aim/aimcontact.cpp
+++ b/kopete/protocols/oscar/aim/aimcontact.cpp
@@ -22,7 +22,7 @@
 #include <tqtextcodec.h>
 
 #include <kapplication.h>
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
diff --git a/kopete/protocols/oscar/icq/icqaccount.cpp b/kopete/protocols/oscar/icq/icqaccount.cpp
index 7627648c..53ca409a 100644
--- a/kopete/protocols/oscar/icq/icqaccount.cpp
+++ b/kopete/protocols/oscar/icq/icqaccount.cpp
@@ -20,7 +20,7 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kmdcodec.h>
 #include <kmessagebox.h>
 
diff --git a/kopete/protocols/oscar/icq/icqcontact.cpp b/kopete/protocols/oscar/icq/icqcontact.cpp
index 19d2ee7f..5acd5859 100644
--- a/kopete/protocols/oscar/icq/icqcontact.cpp
+++ b/kopete/protocols/oscar/icq/icqcontact.cpp
@@ -21,8 +21,8 @@
 #include <tqimage.h>
 #include <tqfile.h>
 
-#include <kaction.h>
-#include <kactionclasses.h>
+#include <tdeaction.h>
+#include <tdeactionclasses.h>
 #include <kapplication.h>
 #include <kdebug.h>
 #include <kiconloader.h>
diff --git a/kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp b/kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp
index 935b9853..a5071753 100644
--- a/kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp
+++ b/kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp
@@ -28,7 +28,7 @@
 
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kpushbutton.h>
 #include <kmessagebox.h>
diff --git a/kopete/protocols/oscar/icq/ui/icqsearchbase.ui b/kopete/protocols/oscar/icq/ui/icqsearchbase.ui
index a027985f..e2fb2c6b 100644
--- a/kopete/protocols/oscar/icq/ui/icqsearchbase.ui
+++ b/kopete/protocols/oscar/icq/ui/icqsearchbase.ui
@@ -486,7 +486,7 @@
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
 </includehints>
diff --git a/kopete/protocols/oscar/icq/ui/icqsearchdialog.cpp b/kopete/protocols/oscar/icq/ui/icqsearchdialog.cpp
index f8b16198..59cf7e92 100644
--- a/kopete/protocols/oscar/icq/ui/icqsearchdialog.cpp
+++ b/kopete/protocols/oscar/icq/ui/icqsearchdialog.cpp
@@ -26,7 +26,7 @@
 #include <tqtabwidget.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kpushbutton.h>
 #include <kmessagebox.h>
diff --git a/kopete/protocols/oscar/oscarcontact.cpp b/kopete/protocols/oscar/oscarcontact.cpp
index c145b467..f9bf5fae 100644
--- a/kopete/protocols/oscar/oscarcontact.cpp
+++ b/kopete/protocols/oscar/oscarcontact.cpp
@@ -21,7 +21,7 @@
 #include <tqapplication.h>
 #include <tqtextcodec.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/kopete/protocols/sms/smsaccount.cpp b/kopete/protocols/sms/smsaccount.cpp
index 6e09bd11..4cfd4788 100644
--- a/kopete/protocols/sms/smsaccount.cpp
+++ b/kopete/protocols/sms/smsaccount.cpp
@@ -17,8 +17,8 @@
 #undef KDE_NO_COMPAT
 
 #include <tdeconfigbase.h>
-#include <kaction.h>
-#include <kpopupmenu.h>
+#include <tdeaction.h>
+#include <tdepopupmenu.h>
 #include <kprocess.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
diff --git a/kopete/protocols/sms/smscontact.cpp b/kopete/protocols/sms/smscontact.cpp
index 5e4c9cb4..e15861ee 100644
--- a/kopete/protocols/sms/smscontact.cpp
+++ b/kopete/protocols/sms/smscontact.cpp
@@ -16,7 +16,7 @@
 
 #undef KDE_NO_COMPAT
 #include <tdeconfigbase.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/kopete/protocols/testbed/testbedaccount.cpp b/kopete/protocols/testbed/testbedaccount.cpp
index eb601ffc..bf33a02f 100644
--- a/kopete/protocols/testbed/testbedaccount.cpp
+++ b/kopete/protocols/testbed/testbedaccount.cpp
@@ -16,10 +16,10 @@
 
 #include "testbedaccount.h"
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include "kopetemetacontact.h"
 #include "kopetecontactlist.h"
diff --git a/kopete/protocols/testbed/testbedcontact.cpp b/kopete/protocols/testbed/testbedcontact.cpp
index d383c04c..56513f14 100644
--- a/kopete/protocols/testbed/testbedcontact.cpp
+++ b/kopete/protocols/testbed/testbedcontact.cpp
@@ -16,7 +16,7 @@
 
 #include "testbedcontact.h"
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <klocale.h>
 
diff --git a/kopete/protocols/winpopup/wpaccount.cpp b/kopete/protocols/winpopup/wpaccount.cpp
index 5d9d2a99..5d212fdd 100644
--- a/kopete/protocols/winpopup/wpaccount.cpp
+++ b/kopete/protocols/winpopup/wpaccount.cpp
@@ -23,7 +23,7 @@
 
 // KDE Includes
 #include <kdebug.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <klocale.h>
 #include <tdeconfig.h>
 
diff --git a/kopete/protocols/winpopup/wpcontact.h b/kopete/protocols/winpopup/wpcontact.h
index f478c3ff..d37dd420 100644
--- a/kopete/protocols/winpopup/wpcontact.h
+++ b/kopete/protocols/winpopup/wpcontact.h
@@ -19,7 +19,7 @@
 #define WPCONTACT_H
 
 // KDE Includes
-#include <kaction.h>
+#include <tdeaction.h>
 
 // TQt Includes
 //#include <tqvaluestack.h>
diff --git a/kopete/protocols/yahoo/yahooaccount.cpp b/kopete/protocols/yahoo/yahooaccount.cpp
index 4edc14e6..81fa7514 100644
--- a/kopete/protocols/yahoo/yahooaccount.cpp
+++ b/kopete/protocols/yahoo/yahooaccount.cpp
@@ -35,8 +35,8 @@
 #include <klocale.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kaction.h>
-#include <kpopupmenu.h>
+#include <tdeaction.h>
+#include <tdepopupmenu.h>
 #include <kmessagebox.h>
 #include <krun.h>
 #include <kstandarddirs.h>
diff --git a/kopete/protocols/yahoo/yahoochatsession.cpp b/kopete/protocols/yahoo/yahoochatsession.cpp
index c8eaf102..e59c5062 100644
--- a/kopete/protocols/yahoo/yahoochatsession.cpp
+++ b/kopete/protocols/yahoo/yahoochatsession.cpp
@@ -26,10 +26,10 @@
 #include <kinputdialog.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <ktempfile.h>
-#include <kmainwindow.h>
-#include <ktoolbar.h>
+#include <tdemainwindow.h>
+#include <tdetoolbar.h>
 #include <krun.h>
 #include <kiconloader.h>
 
diff --git a/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp b/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp
index 64656e75..c96d52da 100644
--- a/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp
+++ b/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp
@@ -20,7 +20,7 @@
 #include <klineeditdlg.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tdeconfig.h>
 
 #include <kopetecontactaction.h>
diff --git a/kopete/protocols/yahoo/yahoocontact.cpp b/kopete/protocols/yahoo/yahoocontact.cpp
index fbc1718d..1ca1a3db 100644
--- a/kopete/protocols/yahoo/yahoocontact.cpp
+++ b/kopete/protocols/yahoo/yahoocontact.cpp
@@ -45,11 +45,11 @@
 
 // KDE Includes
 #include <kdebug.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <klocale.h>
 #include <krun.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 #include <kmessagebox.h>
 #include <ktempfile.h>
 #include <tdeio/global.h>