diff --git a/keep/app/advancedbackupconfigdialog.cpp b/keep/app/advancedbackupconfigdialog.cpp
index 7ddbac9..9f6a5a9 100644
--- a/keep/app/advancedbackupconfigdialog.cpp
+++ b/keep/app/advancedbackupconfigdialog.cpp
@@ -29,7 +29,7 @@
 #include <kapplication.h>
 #include <kiconloader.h>
 #include <tqstringlist.h>
-#include <kactionselector.h>
+#include <tdeactionselector.h>
 
 AdvancedBackupConfigDialog::AdvancedBackupConfigDialog(TQWidget *parent):KDialogBase(Plain, i18n("Advanced Backup Configuration"),
 	Help|Ok, Ok, parent, "advancedBackupConfigDialog", true, false)
diff --git a/keep/app/advancedbackupconfigview.ui b/keep/app/advancedbackupconfigview.ui
index 26411ea..a1ad767 100644
--- a/keep/app/advancedbackupconfigview.ui
+++ b/keep/app/advancedbackupconfigview.ui
@@ -85,6 +85,6 @@
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kactivelabel.h</includehint>
-    <includehint>kactionselector.h</includehint>
+    <includehint>tdeactionselector.h</includehint>
 </includehints>
 </UI>
diff --git a/keep/app/backuplistview.ui b/keep/app/backuplistview.ui
index 9c0a0fe..33603c8 100644
--- a/keep/app/backuplistview.ui
+++ b/keep/app/backuplistview.ui
@@ -149,7 +149,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/keep/app/backuplistwidget.cpp b/keep/app/backuplistwidget.cpp
index a87319f..d63ad16 100644
--- a/keep/app/backuplistwidget.cpp
+++ b/keep/app/backuplistwidget.cpp
@@ -19,7 +19,7 @@
 #include "backuplistwidget.h"
 
 #include <tqpushbutton.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <tqstringlist.h>
 #include <kurlrequester.h>
 #include <kdebug.h>
diff --git a/keep/app/forcebackupdialogview.ui b/keep/app/forcebackupdialogview.ui
index da09c07..6c3f97d 100644
--- a/keep/app/forcebackupdialogview.ui
+++ b/keep/app/forcebackupdialogview.ui
@@ -124,6 +124,6 @@
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kactivelabel.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/keep/app/includeexcludedialog.cpp b/keep/app/includeexcludedialog.cpp
index fd2f066..ad71414 100644
--- a/keep/app/includeexcludedialog.cpp
+++ b/keep/app/includeexcludedialog.cpp
@@ -30,8 +30,8 @@
 #include <kpushbutton.h>
 #include <kiconloader.h>
 #include <tqstringlist.h>
-#include <kactionselector.h>
-#include <klistview.h>
+#include <tdeactionselector.h>
+#include <tdelistview.h>
 #include <kurlrequester.h>
 
 #include "includeexcludeitem.h"
diff --git a/keep/app/includeexcludedialog.h b/keep/app/includeexcludedialog.h
index d5d79a8..5bac7c2 100644
--- a/keep/app/includeexcludedialog.h
+++ b/keep/app/includeexcludedialog.h
@@ -20,7 +20,7 @@
 #define _INCLUDEEXCLUDEDIALOG_H_
 
 #include <kdialogbase.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include "includeexcludeview.h"
 
diff --git a/keep/app/includeexcludeview.ui b/keep/app/includeexcludeview.ui
index 4637c3f..e668a67 100644
--- a/keep/app/includeexcludeview.ui
+++ b/keep/app/includeexcludeview.ui
@@ -210,7 +210,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>
 </includehints>
 </UI>
diff --git a/keep/app/keepmainwindow.cpp b/keep/app/keepmainwindow.cpp
index d7a127f..0ed19bd 100644
--- a/keep/app/keepmainwindow.cpp
+++ b/keep/app/keepmainwindow.cpp
@@ -22,7 +22,7 @@
 #include <tqlayout.h>
 #include <tqvariant.h>
 #include <dcopclient.h>
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
 #include <kstdaction.h>
 #include <kdebug.h>
 #include <klocale.h>
diff --git a/keep/app/keepmainwindow.h b/keep/app/keepmainwindow.h
index 6171f12..14fd931 100644
--- a/keep/app/keepmainwindow.h
+++ b/keep/app/keepmainwindow.h
@@ -19,7 +19,7 @@
 #ifndef _KEEPMAINWINDOW_H_
 #define _KEEPMAINWINDOW_H_
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <ktabwidget.h>
 #include <tqhbox.h>
 
diff --git a/keep/app/logdialog.cpp b/keep/app/logdialog.cpp
index 6c04f70..a927b21 100644
--- a/keep/app/logdialog.cpp
+++ b/keep/app/logdialog.cpp
@@ -24,7 +24,7 @@
 #include <dcopref.h>
 #include <kdebug.h>
 #include <kactivelabel.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqpixmap.h>
 #include <kcombobox.h>
 #include <tqfile.h>
diff --git a/keep/app/logview.ui b/keep/app/logview.ui
index fe48ab4..c466874 100644
--- a/keep/app/logview.ui
+++ b/keep/app/logview.ui
@@ -81,6 +81,6 @@
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/keep/app/restorebackupwizard.cpp b/keep/app/restorebackupwizard.cpp
index a12ec05..24ed330 100644
--- a/keep/app/restorebackupwizard.cpp
+++ b/keep/app/restorebackupwizard.cpp
@@ -20,7 +20,7 @@
 
 #include <tqpushbutton.h>
 #include <kiconloader.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kmessagebox.h>
 #include <klocale.h>
 #include <kactivelabel.h>
diff --git a/keep/app/restorebackupwizard.h b/keep/app/restorebackupwizard.h
index b331727..8cddbe1 100644
--- a/keep/app/restorebackupwizard.h
+++ b/keep/app/restorebackupwizard.h
@@ -20,7 +20,7 @@
 #define _RESTOREBACKUPWIZARD_H_ 
 
 #include <kwizard.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tqhbox.h>
 #include <tqlistview.h>
 
diff --git a/keep/app/restorebackupwizard1view.ui b/keep/app/restorebackupwizard1view.ui
index 5af77d0..38fb84d 100644
--- a/keep/app/restorebackupwizard1view.ui
+++ b/keep/app/restorebackupwizard1view.ui
@@ -263,7 +263,7 @@
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kactivelabel.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kactivelabel.h</includehint>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/keep/app/restorebackupwizard3view.ui b/keep/app/restorebackupwizard3view.ui
index 57897c6..439e16e 100644
--- a/keep/app/restorebackupwizard3view.ui
+++ b/keep/app/restorebackupwizard3view.ui
@@ -226,6 +226,6 @@
     <includehint>kactivelabel.h</includehint>
     <includehint>kactivelabel.h</includehint>
     <includehint>kactivelabel.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/keep/common/backuplistviewitem.cpp b/keep/common/backuplistviewitem.cpp
index 48c6f1a..3c7ef91 100644
--- a/keep/common/backuplistviewitem.cpp
+++ b/keep/common/backuplistviewitem.cpp
@@ -20,7 +20,7 @@
 
 #include <klocale.h>
 #include <tqdir.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 BackupListViewItem::BackupListViewItem(TDEListView *parent,Backup &backup): TQListViewItem (parent) 
 { 
diff --git a/keep/common/backuplistviewitem.h b/keep/common/backuplistviewitem.h
index 23758b8..55063ce 100644
--- a/keep/common/backuplistviewitem.h
+++ b/keep/common/backuplistviewitem.h
@@ -19,7 +19,7 @@
 #ifndef _BACKUPLISTVIEWITEM_H_
 #define _BACKUPLISTVIEWITEM_H_
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include "backup.h"
 
diff --git a/keep/common/includeexcludeitem.cpp b/keep/common/includeexcludeitem.cpp
index ae08773..a75229a 100644
--- a/keep/common/includeexcludeitem.cpp
+++ b/keep/common/includeexcludeitem.cpp
@@ -20,7 +20,7 @@
 
 #include <klocale.h>
 #include <tqdir.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 IncludeExcludeItem::IncludeExcludeItem(TDEListView *parent,TQString includeExclude): TQListViewItem (parent) 
 { 
diff --git a/keep/common/includeexcludeitem.h b/keep/common/includeexcludeitem.h
index 3315de8..4c4e08a 100644
--- a/keep/common/includeexcludeitem.h
+++ b/keep/common/includeexcludeitem.h
@@ -19,7 +19,7 @@
 #ifndef _INCLUDEEXCLUDEITEM_H_
 #define _INCLUDEEXCLUDEITEM_H_
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include "backup.h"
 
diff --git a/keep/common/incrementlistviewitem.cpp b/keep/common/incrementlistviewitem.cpp
index c0c4a23..1ca9249 100644
--- a/keep/common/incrementlistviewitem.cpp
+++ b/keep/common/incrementlistviewitem.cpp
@@ -20,7 +20,7 @@
 
 #include <klocale.h>
 #include <tqdir.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 IncrementListViewItem::IncrementListViewItem(TDEListView *parent,TQDateTime date): TQListViewItem (parent) 
 { 
diff --git a/keep/common/incrementlistviewitem.h b/keep/common/incrementlistviewitem.h
index 1315935..d7d8df8 100644
--- a/keep/common/incrementlistviewitem.h
+++ b/keep/common/incrementlistviewitem.h
@@ -19,7 +19,7 @@
 #ifndef _INCREMENTLISTVIEWITEM_H_
 #define _INCREMENTLISTVIEWITEM_H_
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqdatetime.h>