Rename many classes and header files to avoid conflicts with KDE4

92 files changed, 124 insertions, 124 deletions

diff --git a/kipi-plugins/ChangeLog b/kipi-plugins/ChangeLog
index 2e1eb0d..dde388b 100644
--- a/kipi-plugins/ChangeLog
+++ b/kipi-plugins/ChangeLog
@@ -5145,8 +5145,8 @@ V 0.1.4-beta1 - 2007-06-04
 	  kipi-plugins/sync/plugin_sync.cpp,
 	  kipi-plugins/sync/plugin_sync.h, kipi-plugins/sync/sink.cpp,
 	  kipi-plugins/sync/sink.h, kipi-plugins/sync/sinkfactory.cpp,
-	  kipi-plugins/sync/sinkfactory.h, kipi-plugins/sync/sinklist.cpp,
-	  kipi-plugins/sync/sinklist.h, kipi-plugins/sync/sinks.cpp,
+	  kipi-plugins/sync/sinkfactory.h, kipi-plugins/sync/sintdelist.cpp,
+	  kipi-plugins/sync/sintdelist.h, kipi-plugins/sync/sinks.cpp,
 	  kipi-plugins/sync/sinks.h,
 	  kipi-plugins/sync/sinks/gallery/gallerycollection.cpp,
 	  kipi-plugins/sync/sinks/gallery/gallerycollection.h,
@@ -6647,8 +6647,8 @@ V 0.1.3 - 2007-01-24
 
 	* [r626123] kipi-plugins/sync/Makefile.am,
 	  kipi-plugins/sync/sinkfactory.cpp,
-	  kipi-plugins/sync/sinkfactory.h, kipi-plugins/sync/sinklist.cpp,
-	  kipi-plugins/sync/sinklistbase.ui, kipi-plugins/sync/sinks.cpp,
+	  kipi-plugins/sync/sinkfactory.h, kipi-plugins/sync/sintdelist.cpp,
+	  kipi-plugins/sync/sintdelistbase.ui, kipi-plugins/sync/sinks.cpp,
 	  kipi-plugins/sync/sinks.h:
 	  Slowly work towards a structure for creating Sinks (definition of
 	  Sink is still very incomplete)
@@ -6657,8 +6657,8 @@ V 0.1.3 - 2007-01-24
 
 	* [r625683] kipi-plugins/sync, kipi-plugins/sync/Makefile.am,
 	  kipi-plugins/sync/plugin_sync.cpp,
-	  kipi-plugins/sync/plugin_sync.h, kipi-plugins/sync/sinklist.cpp,
-	  kipi-plugins/sync/sinklist.h, kipi-plugins/sync/sinklistbase.ui,
+	  kipi-plugins/sync/plugin_sync.h, kipi-plugins/sync/sintdelist.cpp,
+	  kipi-plugins/sync/sintdelist.h, kipi-plugins/sync/sintdelistbase.ui,
 	  kipi-plugins/sync/sinks.cpp, kipi-plugins/sync/sinks.h:
 	  Convert the listing dialog to a .ui file and adapt other parts to
 	  use it.
@@ -6667,8 +6667,8 @@ V 0.1.3 - 2007-01-24
 2007-01-20 13:51  cguthrie
 
 	* [r625578] kipi-plugins/sync/gallerylist.cpp,
-	  kipi-plugins/sync/gallerylist.h, kipi-plugins/sync/sinklist.cpp,
-	  kipi-plugins/sync/sinklist.h:
+	  kipi-plugins/sync/gallerylist.h, kipi-plugins/sync/sintdelist.cpp,
+	  kipi-plugins/sync/sintdelist.h:
 	  More gallery->sync renames: This really needs proper refactoring,
 	  but just trying to get something that at least partly compiles
 	  first.
diff --git a/kipi-plugins/acquireimages/acquireimagedialog.cpp b/kipi-plugins/acquireimages/acquireimagedialog.cpp
index fef56b7..2d81462 100644
--- a/kipi-plugins/acquireimages/acquireimagedialog.cpp
+++ b/kipi-plugins/acquireimages/acquireimagedialog.cpp
@@ -64,7 +64,7 @@ extern "C"
 #include <knuminput.h>
 #include <kinstance.h>
 #include <tdeconfig.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <klineeditdlg.h>
 #include <ksqueezedtextlabel.h>
 #include <tdeio/netaccess.h>
@@ -77,7 +77,7 @@ extern "C"
 #include <kaboutdata.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 // Include files for libKipi.
 
diff --git a/kipi-plugins/acquireimages/plugin_acquireimages.cpp b/kipi-plugins/acquireimages/plugin_acquireimages.cpp
index 9ef00c4..ada1dd8 100644
--- a/kipi-plugins/acquireimages/plugin_acquireimages.cpp
+++ b/kipi-plugins/acquireimages/plugin_acquireimages.cpp
@@ -27,7 +27,7 @@
 // Include files for KDE
 
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
 #include <tdeconfig.h>
diff --git a/kipi-plugins/acquireimages/screenshotdialog.cpp b/kipi-plugins/acquireimages/screenshotdialog.cpp
index b62793f..004165b 100644
--- a/kipi-plugins/acquireimages/screenshotdialog.cpp
+++ b/kipi-plugins/acquireimages/screenshotdialog.cpp
@@ -54,7 +54,7 @@ extern "C"
 #include <kaboutdata.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 
 // Local includes
diff --git a/kipi-plugins/batchprocessimages/batchprocessimagesdialog.cpp b/kipi-plugins/batchprocessimages/batchprocessimagesdialog.cpp
index 3879225..64f6cc2 100644
--- a/kipi-plugins/batchprocessimages/batchprocessimagesdialog.cpp
+++ b/kipi-plugins/batchprocessimages/batchprocessimagesdialog.cpp
@@ -66,7 +66,7 @@ extern "C"
 #include <kapplication.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kimageio.h>
 #include <kprocess.h>
 #include <klineeditdlg.h>
diff --git a/kipi-plugins/batchprocessimages/batchprocessimagesitem.h b/kipi-plugins/batchprocessimages/batchprocessimagesitem.h
index 0422578..652f66b 100644
--- a/kipi-plugins/batchprocessimages/batchprocessimagesitem.h
+++ b/kipi-plugins/batchprocessimages/batchprocessimagesitem.h
@@ -30,7 +30,7 @@
 
 // Include files for KDE
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 class TQPainter;
 class TQListView;
diff --git a/kipi-plugins/batchprocessimages/batchprocessimageslist.h b/kipi-plugins/batchprocessimages/batchprocessimageslist.h
index 0028193..c528ae1 100644
--- a/kipi-plugins/batchprocessimages/batchprocessimageslist.h
+++ b/kipi-plugins/batchprocessimages/batchprocessimageslist.h
@@ -29,7 +29,7 @@
 
 // Include files for KDE
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 namespace KIPIBatchProcessImagesPlugin
 {
diff --git a/kipi-plugins/batchprocessimages/borderimagesdialog.cpp b/kipi-plugins/batchprocessimages/borderimagesdialog.cpp
index 97e8ccc..4a1a343 100644
--- a/kipi-plugins/batchprocessimages/borderimagesdialog.cpp
+++ b/kipi-plugins/batchprocessimages/borderimagesdialog.cpp
@@ -40,7 +40,7 @@
 #include <kapplication.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 // Local includes
 
diff --git a/kipi-plugins/batchprocessimages/colorimagesdialog.cpp b/kipi-plugins/batchprocessimages/colorimagesdialog.cpp
index 322c93e..ff57cdf 100644
--- a/kipi-plugins/batchprocessimages/colorimagesdialog.cpp
+++ b/kipi-plugins/batchprocessimages/colorimagesdialog.cpp
@@ -39,7 +39,7 @@
 #include <kapplication.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 // Local includes
 
diff --git a/kipi-plugins/batchprocessimages/convertimagesdialog.cpp b/kipi-plugins/batchprocessimages/convertimagesdialog.cpp
index 74e5b92..2c8c6ce 100644
--- a/kipi-plugins/batchprocessimages/convertimagesdialog.cpp
+++ b/kipi-plugins/batchprocessimages/convertimagesdialog.cpp
@@ -41,7 +41,7 @@
 #include <kapplication.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kurlrequester.h>
 
 // LibKExiv2 includes. 
diff --git a/kipi-plugins/batchprocessimages/effectimagesdialog.cpp b/kipi-plugins/batchprocessimages/effectimagesdialog.cpp
index 19bc545..a6d1c12 100644
--- a/kipi-plugins/batchprocessimages/effectimagesdialog.cpp
+++ b/kipi-plugins/batchprocessimages/effectimagesdialog.cpp
@@ -39,7 +39,7 @@
 #include <kapplication.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 // Local includes
 
diff --git a/kipi-plugins/batchprocessimages/filterimagesdialog.cpp b/kipi-plugins/batchprocessimages/filterimagesdialog.cpp
index f39c6a0..be9dc6d 100644
--- a/kipi-plugins/batchprocessimages/filterimagesdialog.cpp
+++ b/kipi-plugins/batchprocessimages/filterimagesdialog.cpp
@@ -39,7 +39,7 @@
 #include <kapplication.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 // Local includes
 
diff --git a/kipi-plugins/batchprocessimages/imagepreview.cpp b/kipi-plugins/batchprocessimages/imagepreview.cpp
index c86cf6d..f5c7502 100644
--- a/kipi-plugins/batchprocessimages/imagepreview.cpp
+++ b/kipi-plugins/batchprocessimages/imagepreview.cpp
@@ -62,7 +62,7 @@ extern "C"
 #include <kapplication.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tdeversion.h>
 
 // Local includes
diff --git a/kipi-plugins/batchprocessimages/outputdialog.cpp b/kipi-plugins/batchprocessimages/outputdialog.cpp
index c64da56..02d6df1 100644
--- a/kipi-plugins/batchprocessimages/outputdialog.cpp
+++ b/kipi-plugins/batchprocessimages/outputdialog.cpp
@@ -34,7 +34,7 @@
 #include <kapplication.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 
 // Local includes
diff --git a/kipi-plugins/batchprocessimages/plugin_batchprocessimages.cpp b/kipi-plugins/batchprocessimages/plugin_batchprocessimages.cpp
index 1076f93..0e963f7 100644
--- a/kipi-plugins/batchprocessimages/plugin_batchprocessimages.cpp
+++ b/kipi-plugins/batchprocessimages/plugin_batchprocessimages.cpp
@@ -36,7 +36,7 @@ extern "C"
 #include <klocale.h>
 #include <kapplication.h>
 #include <kglobal.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
 #include <tdeconfig.h>
diff --git a/kipi-plugins/batchprocessimages/recompressimagesdialog.cpp b/kipi-plugins/batchprocessimages/recompressimagesdialog.cpp
index 955820f..fd0ece7 100644
--- a/kipi-plugins/batchprocessimages/recompressimagesdialog.cpp
+++ b/kipi-plugins/batchprocessimages/recompressimagesdialog.cpp
@@ -39,7 +39,7 @@
 #include <kapplication.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 // Local includes
 
diff --git a/kipi-plugins/batchprocessimages/renameimagesbase.ui b/kipi-plugins/batchprocessimages/renameimagesbase.ui
index 993238f..8d92f78 100644
--- a/kipi-plugins/batchprocessimages/renameimagesbase.ui
+++ b/kipi-plugins/batchprocessimages/renameimagesbase.ui
@@ -354,6 +354,6 @@
 </customwidgets>
 <layoutdefaults spacing="6" margin="6"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/kipi-plugins/batchprocessimages/renameimagesdialog.cpp b/kipi-plugins/batchprocessimages/renameimagesdialog.cpp
index 720431b..6228a11 100644
--- a/kipi-plugins/batchprocessimages/renameimagesdialog.cpp
+++ b/kipi-plugins/batchprocessimages/renameimagesdialog.cpp
@@ -31,7 +31,7 @@
 #include <kapplication.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 // Local includes.
 
diff --git a/kipi-plugins/batchprocessimages/resizeimagesdialog.cpp b/kipi-plugins/batchprocessimages/resizeimagesdialog.cpp
index 4ac6265..9bae472 100644
--- a/kipi-plugins/batchprocessimages/resizeimagesdialog.cpp
+++ b/kipi-plugins/batchprocessimages/resizeimagesdialog.cpp
@@ -41,7 +41,7 @@
 #include <kapplication.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 // Local includes
 
diff --git a/kipi-plugins/calendar/calwizard.cpp b/kipi-plugins/calendar/calwizard.cpp
index 647552e..e62c1d7 100644
--- a/kipi-plugins/calendar/calwizard.cpp
+++ b/kipi-plugins/calendar/calwizard.cpp
@@ -43,7 +43,7 @@
 #include <kapplication.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <tdeversion.h>
 #include <kcalendarsystem.h>
diff --git a/kipi-plugins/calendar/plugin_calendar.cpp b/kipi-plugins/calendar/plugin_calendar.cpp
index 181c20c..d5f01d5 100644
--- a/kipi-plugins/calendar/plugin_calendar.cpp
+++ b/kipi-plugins/calendar/plugin_calendar.cpp
@@ -27,7 +27,7 @@
 // KDE includes.
 
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
 #include <tdeconfig.h>
diff --git a/kipi-plugins/cdarchiving/cdarchiving.h b/kipi-plugins/cdarchiving/cdarchiving.h
index 5a18ac4..611ab8d 100644
--- a/kipi-plugins/cdarchiving/cdarchiving.h
+++ b/kipi-plugins/cdarchiving/cdarchiving.h
@@ -43,7 +43,7 @@ extern "C"
 
 // KDE includes
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kurl.h>
 
 // KIPI includes
diff --git a/kipi-plugins/cdarchiving/cdarchivingdialog.cpp b/kipi-plugins/cdarchiving/cdarchivingdialog.cpp
index 4cfb5f3..00ac2bd 100644
--- a/kipi-plugins/cdarchiving/cdarchivingdialog.cpp
+++ b/kipi-plugins/cdarchiving/cdarchivingdialog.cpp
@@ -51,16 +51,16 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdirsize.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
 #include <kglobalsettings.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
 #include <klineedit.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <knuminput.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <ksqueezedtextlabel.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
diff --git a/kipi-plugins/cdarchiving/plugin_cdarchiving.cpp b/kipi-plugins/cdarchiving/plugin_cdarchiving.cpp
index e5d789a..b459814 100644
--- a/kipi-plugins/cdarchiving/plugin_cdarchiving.cpp
+++ b/kipi-plugins/cdarchiving/plugin_cdarchiving.cpp
@@ -22,7 +22,7 @@
 
 // KDE includes
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
diff --git a/kipi-plugins/findimages/displaycompare.cpp b/kipi-plugins/findimages/displaycompare.cpp
index 8962761..d92ade8 100644
--- a/kipi-plugins/findimages/displaycompare.cpp
+++ b/kipi-plugins/findimages/displaycompare.cpp
@@ -45,7 +45,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kiconloader.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <ksqueezedtextlabel.h>
 #include <kapplication.h>
 #include <kurl.h>
@@ -56,7 +56,7 @@
 #include <kimageio.h>
 #include <tdeio/previewjob.h>
 #include <khelpmenu.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 
 // Include files for KIPI
diff --git a/kipi-plugins/findimages/finddupplicatedialog.cpp b/kipi-plugins/findimages/finddupplicatedialog.cpp
index 82ccc9e..9b0836e 100644
--- a/kipi-plugins/findimages/finddupplicatedialog.cpp
+++ b/kipi-plugins/findimages/finddupplicatedialog.cpp
@@ -39,7 +39,7 @@
 // Include files for KDE
 
 #include <klocale.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <kurlrequester.h>
@@ -54,9 +54,9 @@
 #include <kapplication.h>
 #include <ksqueezedtextlabel.h>
 #include <tdeio/global.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <khelpmenu.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 // Include files for KIPI
 
diff --git a/kipi-plugins/findimages/plugin_findimages.cpp b/kipi-plugins/findimages/plugin_findimages.cpp
index 9335425..d6aaf1e 100644
--- a/kipi-plugins/findimages/plugin_findimages.cpp
+++ b/kipi-plugins/findimages/plugin_findimages.cpp
@@ -28,7 +28,7 @@
 // KDE includes.
 
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
 #include <tdeconfig.h>
diff --git a/kipi-plugins/flickrexport/flickrwindow.cpp b/kipi-plugins/flickrexport/flickrwindow.cpp
index 5de3979..d614e59 100644
--- a/kipi-plugins/flickrexport/flickrwindow.cpp
+++ b/kipi-plugins/flickrexport/flickrwindow.cpp
@@ -37,7 +37,7 @@
 
 #include <klineedit.h>
 #include <khelpmenu.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kapplication.h>
diff --git a/kipi-plugins/flickrexport/plugin_flickrexport.cpp b/kipi-plugins/flickrexport/plugin_flickrexport.cpp
index 00f3fe7..0464a73 100644
--- a/kipi-plugins/flickrexport/plugin_flickrexport.cpp
+++ b/kipi-plugins/flickrexport/plugin_flickrexport.cpp
@@ -30,7 +30,7 @@ extern "C"
 // KDE includes.
 
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
 #include <tdeconfig.h>
diff --git a/kipi-plugins/galleryexport/gallerywindow.cpp b/kipi-plugins/galleryexport/gallerywindow.cpp
index 097d9df..be5087f 100644
--- a/kipi-plugins/galleryexport/gallerywindow.cpp
+++ b/kipi-plugins/galleryexport/gallerywindow.cpp
@@ -35,7 +35,7 @@
 
 #include <kaboutdata.h>
 #include <khelpmenu.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kapplication.h>
diff --git a/kipi-plugins/galleryexport/plugin_galleryexport.cpp b/kipi-plugins/galleryexport/plugin_galleryexport.cpp
index d277096..955c2f9 100644
--- a/kipi-plugins/galleryexport/plugin_galleryexport.cpp
+++ b/kipi-plugins/galleryexport/plugin_galleryexport.cpp
@@ -23,7 +23,7 @@
 
 // KDE includes.
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
 #include <tdeconfig.h>
diff --git a/kipi-plugins/gpssync/gpseditdialog.cpp b/kipi-plugins/gpssync/gpseditdialog.cpp
index bb80c9f..4b00658 100644
--- a/kipi-plugins/gpssync/gpseditdialog.cpp
+++ b/kipi-plugins/gpssync/gpseditdialog.cpp
@@ -39,7 +39,7 @@
 #include <klineedit.h>
 #include <kmessagebox.h>
 #include <tdehtmlview.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 // Local includes.
 
diff --git a/kipi-plugins/gpssync/gpslistviewitem.h b/kipi-plugins/gpssync/gpslistviewitem.h
index 14df8a0..3fbf5b0 100644
--- a/kipi-plugins/gpssync/gpslistviewitem.h
+++ b/kipi-plugins/gpssync/gpslistviewitem.h
@@ -31,7 +31,7 @@
 // KDE includes.
 
 #include <kurl.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 // Local includes.
 
diff --git a/kipi-plugins/gpssync/gpssyncdialog.cpp b/kipi-plugins/gpssync/gpssyncdialog.cpp
index 6ea5244..88152fa 100644
--- a/kipi-plugins/gpssync/gpssyncdialog.cpp
+++ b/kipi-plugins/gpssync/gpssyncdialog.cpp
@@ -40,9 +40,9 @@
 #include <khelpmenu.h>
 #include <ksqueezedtextlabel.h>
 #include <kiconloader.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tdefiledialog.h>
 #include <tdeconfig.h>
 #include <kmessagebox.h>
diff --git a/kipi-plugins/gpssync/kmlexportconfig.cpp b/kipi-plugins/gpssync/kmlexportconfig.cpp
index 362fea3..1282365 100644
--- a/kipi-plugins/gpssync/kmlexportconfig.cpp
+++ b/kipi-plugins/gpssync/kmlexportconfig.cpp
@@ -45,7 +45,7 @@
 #include <klineedit.h>
 #include <knuminput.h>
 #include "kpaboutdata.h"
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <kurlrequester.h>
 
diff --git a/kipi-plugins/gpssync/plugin_gpssync.cpp b/kipi-plugins/gpssync/plugin_gpssync.cpp
index 9fdc9fd..5c57dce 100644
--- a/kipi-plugins/gpssync/plugin_gpssync.cpp
+++ b/kipi-plugins/gpssync/plugin_gpssync.cpp
@@ -29,7 +29,7 @@
 // KDE includes.
 
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
diff --git a/kipi-plugins/helloworld/plugin_helloworld.cpp b/kipi-plugins/helloworld/plugin_helloworld.cpp
index 4775614..c47959c 100644
--- a/kipi-plugins/helloworld/plugin_helloworld.cpp
+++ b/kipi-plugins/helloworld/plugin_helloworld.cpp
@@ -21,7 +21,7 @@
 // KDE includes.
   
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
 #include <tdeconfig.h>
diff --git a/kipi-plugins/htmlexport/plugin.cpp b/kipi-plugins/htmlexport/plugin.cpp
index 214cac2..314e715 100644
--- a/kipi-plugins/htmlexport/plugin.cpp
+++ b/kipi-plugins/htmlexport/plugin.cpp
@@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 #include "plugin.moc"
 
 // KDE
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
diff --git a/kipi-plugins/htmlexport/themepage.ui b/kipi-plugins/htmlexport/themepage.ui
index e6e4963..382b7f9 100644
--- a/kipi-plugins/htmlexport/themepage.ui
+++ b/kipi-plugins/htmlexport/themepage.ui
@@ -35,7 +35,7 @@
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
     <includehint>ktextbrowser.h</includehint>
 </includehints>
 </UI>
diff --git a/kipi-plugins/htmlexport/wizard.cpp b/kipi-plugins/htmlexport/wizard.cpp
index 961714d..a0d46fb 100644
--- a/kipi-plugins/htmlexport/wizard.cpp
+++ b/kipi-plugins/htmlexport/wizard.cpp
@@ -36,14 +36,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 #include <tdeconfigdialogmanager.h>
 #include <kdebug.h>
 #include <kdialog.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <klocale.h>
 #include <ktextbrowser.h>
 #include <kurlrequester.h>
 #include <kwizard.h>
 #include <kapplication.h>
 #include <khelpmenu.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 // KIPI
 #include <libkipi/imagecollectionselector.h>
diff --git a/kipi-plugins/ipodexport/imagelist.h b/kipi-plugins/ipodexport/imagelist.h
index 6f24750..eddeb3a 100644
--- a/kipi-plugins/ipodexport/imagelist.h
+++ b/kipi-plugins/ipodexport/imagelist.h
@@ -24,7 +24,7 @@
 #ifndef IMAGELIST_H
 #define IMAGELIST_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 namespace IpodExport
 {
diff --git a/kipi-plugins/ipodexport/imagelistitem.h b/kipi-plugins/ipodexport/imagelistitem.h
index fe57c84..dfa2325 100644
--- a/kipi-plugins/ipodexport/imagelistitem.h
+++ b/kipi-plugins/ipodexport/imagelistitem.h
@@ -19,7 +19,7 @@ extern "C" {
 }
 
 #include <tqstring.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 
 namespace IpodExport
diff --git a/kipi-plugins/ipodexport/ipodlistitem.h b/kipi-plugins/ipodexport/ipodlistitem.h
index 4111ad5..a23126f 100644
--- a/kipi-plugins/ipodexport/ipodlistitem.h
+++ b/kipi-plugins/ipodexport/ipodlistitem.h
@@ -18,7 +18,7 @@ extern "C" {
 #include <gpod/itdb.h>
 }
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 namespace IpodExport
 {
diff --git a/kipi-plugins/ipodexport/plugin_ipodexport.cpp b/kipi-plugins/ipodexport/plugin_ipodexport.cpp
index 0892d19..4aa04f8 100644
--- a/kipi-plugins/ipodexport/plugin_ipodexport.cpp
+++ b/kipi-plugins/ipodexport/plugin_ipodexport.cpp
@@ -21,7 +21,7 @@ extern "C" {
 #include <libkipi/imagecollection.h>
 
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
diff --git a/kipi-plugins/jpeglossless/plugin_jpeglossless.cpp b/kipi-plugins/jpeglossless/plugin_jpeglossless.cpp
index af32080..a1d7743 100644
--- a/kipi-plugins/jpeglossless/plugin_jpeglossless.cpp
+++ b/kipi-plugins/jpeglossless/plugin_jpeglossless.cpp
@@ -33,7 +33,7 @@
 // KDE includes.
 
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
 #include <tdeconfig.h>
diff --git a/kipi-plugins/kameraklient/camerafolderitem.h b/kipi-plugins/kameraklient/camerafolderitem.h
index 2c5cedb..a9ab039 100644
--- a/kipi-plugins/kameraklient/camerafolderitem.h
+++ b/kipi-plugins/kameraklient/camerafolderitem.h
@@ -22,7 +22,7 @@
 #ifndef CAMERAFOLDERITEM_H
 #define CAMERAFOLDERITEM_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqstring.h>
 
 namespace KIPIKameraKlientPlugin
diff --git a/kipi-plugins/kameraklient/camerafolderview.h b/kipi-plugins/kameraklient/camerafolderview.h
index 2b10c5e..40d0156 100644
--- a/kipi-plugins/kameraklient/camerafolderview.h
+++ b/kipi-plugins/kameraklient/camerafolderview.h
@@ -25,7 +25,7 @@
 // TQt
 #include <tqstring.h>
 // KDE
-#include <klistview.h>
+#include <tdelistview.h>
 
 namespace KIPIKameraKlientPlugin
 {
diff --git a/kipi-plugins/kameraklient/cameraselection.cpp b/kipi-plugins/kameraklient/cameraselection.cpp
index c9b1005..0a6c52e 100644
--- a/kipi-plugins/kameraklient/cameraselection.cpp
+++ b/kipi-plugins/kameraklient/cameraselection.cpp
@@ -34,7 +34,7 @@
 #include <kapplication.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 
 // Include files for KIPI
diff --git a/kipi-plugins/kameraklient/cameraui.cpp b/kipi-plugins/kameraklient/cameraui.cpp
index 55f3f5c..a6893a7 100644
--- a/kipi-plugins/kameraklient/cameraui.cpp
+++ b/kipi-plugins/kameraklient/cameraui.cpp
@@ -48,7 +48,7 @@
 
 // KDE includes
 
-#include <kaccel.h>
+#include <tdeaccel.h>
 #include <kcombobox.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
@@ -61,13 +61,13 @@
 #include <kkeydialog.h>
 #include <klineeditdlg.h>
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kprogress.h>
 #include <krun.h>
 #include <kservice.h>
 #include <kstandarddirs.h>
 #include <kstatusbar.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <kurl.h>
 #include <kapplication.h>
 #include <khelpmenu.h>
diff --git a/kipi-plugins/kameraklient/kameraklient.cpp b/kipi-plugins/kameraklient/kameraklient.cpp
index 645d30f..99de5cd 100644
--- a/kipi-plugins/kameraklient/kameraklient.cpp
+++ b/kipi-plugins/kameraklient/kameraklient.cpp
@@ -24,13 +24,13 @@
 #include <tqwidget.h>
 // KDE
 #include <kaboutdata.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
 #include <kinstance.h>
 #include <kglobal.h>
 #include <klocale.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 #include <kstandarddirs.h>
 // Local
 #include "cameraui.h"
diff --git a/kipi-plugins/kameraklient/setupcamera.cpp b/kipi-plugins/kameraklient/setupcamera.cpp
index 54c6b4e..65c2f1d 100644
--- a/kipi-plugins/kameraklient/setupcamera.cpp
+++ b/kipi-plugins/kameraklient/setupcamera.cpp
@@ -36,7 +36,7 @@
 #include <kapplication.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 
 // Include files for KIPI
diff --git a/kipi-plugins/metadataedit/commenteditdialog.cpp b/kipi-plugins/metadataedit/commenteditdialog.cpp
index 798b05e..0a32b52 100644
--- a/kipi-plugins/metadataedit/commenteditdialog.cpp
+++ b/kipi-plugins/metadataedit/commenteditdialog.cpp
@@ -38,7 +38,7 @@
 #include <kiconloader.h>
 #include <kapplication.h>
 #include <khelpmenu.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 // Local includes.
 
diff --git a/kipi-plugins/metadataedit/commentremovedialog.cpp b/kipi-plugins/metadataedit/commentremovedialog.cpp
index 488cfc9..19acd29 100644
--- a/kipi-plugins/metadataedit/commentremovedialog.cpp
+++ b/kipi-plugins/metadataedit/commentremovedialog.cpp
@@ -37,7 +37,7 @@
 #include <kiconloader.h>
 #include <kapplication.h>
 #include <khelpmenu.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 // Local includes.
 
diff --git a/kipi-plugins/metadataedit/exifeditdialog.cpp b/kipi-plugins/metadataedit/exifeditdialog.cpp
index 7f9a4b9..acf7e3c 100644
--- a/kipi-plugins/metadataedit/exifeditdialog.cpp
+++ b/kipi-plugins/metadataedit/exifeditdialog.cpp
@@ -36,7 +36,7 @@
 #include <kapplication.h>
 #include <kmessagebox.h>
 #include <khelpmenu.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 // LibKIPI includes.
 
diff --git a/kipi-plugins/metadataedit/iptccategories.cpp b/kipi-plugins/metadataedit/iptccategories.cpp
index 5979c75..8bab7e6 100644
--- a/kipi-plugins/metadataedit/iptccategories.cpp
+++ b/kipi-plugins/metadataedit/iptccategories.cpp
@@ -33,7 +33,7 @@
 
 #include <klocale.h>
 #include <kdialog.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <kiconloader.h>
 #include <klineedit.h>
 #include <kactivelabel.h>
diff --git a/kipi-plugins/metadataedit/iptceditdialog.cpp b/kipi-plugins/metadataedit/iptceditdialog.cpp
index 5a83794..b95cd65 100644
--- a/kipi-plugins/metadataedit/iptceditdialog.cpp
+++ b/kipi-plugins/metadataedit/iptceditdialog.cpp
@@ -36,7 +36,7 @@
 #include <kapplication.h>
 #include <kmessagebox.h>
 #include <khelpmenu.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 // LibKIPI includes.
 
diff --git a/kipi-plugins/metadataedit/iptckeywords.cpp b/kipi-plugins/metadataedit/iptckeywords.cpp
index d22ccc0..aff162d 100644
--- a/kipi-plugins/metadataedit/iptckeywords.cpp
+++ b/kipi-plugins/metadataedit/iptckeywords.cpp
@@ -33,7 +33,7 @@
 
 #include <klocale.h>
 #include <kdialog.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <klineedit.h>
 #include <kactivelabel.h>
 #include <kiconloader.h>
diff --git a/kipi-plugins/metadataedit/iptcsubjects.cpp b/kipi-plugins/metadataedit/iptcsubjects.cpp
index 43e8898..573c6b1 100644
--- a/kipi-plugins/metadataedit/iptcsubjects.cpp
+++ b/kipi-plugins/metadataedit/iptcsubjects.cpp
@@ -33,7 +33,7 @@
 
 #include <klocale.h>
 #include <kdialog.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <klineedit.h>
 #include <kactivelabel.h>
 #include <kiconloader.h>
diff --git a/kipi-plugins/metadataedit/plugin_metadataedit.cpp b/kipi-plugins/metadataedit/plugin_metadataedit.cpp
index 621e372..38f50af 100644
--- a/kipi-plugins/metadataedit/plugin_metadataedit.cpp
+++ b/kipi-plugins/metadataedit/plugin_metadataedit.cpp
@@ -23,13 +23,13 @@
 // KDE includes.
 
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kmessagebox.h>
 #include <tdefiledialog.h>
 #include <kglobalsettings.h>
diff --git a/kipi-plugins/mpegencoder/kimg2mpg.cpp b/kipi-plugins/mpegencoder/kimg2mpg.cpp
index 2471bd6..6fb94ea 100644
--- a/kipi-plugins/mpegencoder/kimg2mpg.cpp
+++ b/kipi-plugins/mpegencoder/kimg2mpg.cpp
@@ -72,7 +72,7 @@ extern "C"
 #include <kcolordialog.h>
 #include <klineedit.h>
 #include <kcolorbutton.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <kbuttonbox.h>
 #include <kurl.h>
 #include <kimageio.h>
@@ -83,7 +83,7 @@ extern "C"
 #include <kapplication.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 // KIPI include files
 
diff --git a/kipi-plugins/mpegencoder/kimg2mpg.h b/kipi-plugins/mpegencoder/kimg2mpg.h
index c807389..67d4198 100644
--- a/kipi-plugins/mpegencoder/kimg2mpg.h
+++ b/kipi-plugins/mpegencoder/kimg2mpg.h
@@ -35,7 +35,7 @@
 // Include files for KDE
 
 #include <kdialog.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <kprocess.h>
 #include <tdeio/previewjob.h>
 
diff --git a/kipi-plugins/mpegencoder/kimg2mpgbase.ui b/kipi-plugins/mpegencoder/kimg2mpgbase.ui
index 3d9408a..f62a131 100644
--- a/kipi-plugins/mpegencoder/kimg2mpgbase.ui
+++ b/kipi-plugins/mpegencoder/kimg2mpgbase.ui
@@ -1289,12 +1289,12 @@ The program uses the 'images2mpg' bash script.</string>
     <include location="global" impldecl="in declaration">libkipi/interface.h</include>
     <include location="global" impldecl="in declaration">kprocess.h</include>
     <include location="global" impldecl="in declaration">tdeio/previewjob.h</include>
-    <include location="global" impldecl="in declaration">klistbox.h</include>
+    <include location="global" impldecl="in declaration">tdelistbox.h</include>
     <include location="global" impldecl="in implementation">klineedit.h</include>
     <include location="global" impldecl="in implementation">libkipi/interface.h</include>
     <include location="global" impldecl="in implementation">kprocess.h</include>
     <include location="global" impldecl="in implementation">tdeio/previewjob.h</include>
-    <include location="global" impldecl="in implementation">klistbox.h</include>
+    <include location="global" impldecl="in implementation">tdelistbox.h</include>
 </includes>
 <Q_SLOTS>
     <slot specifier="non virtual">reset()</slot>
diff --git a/kipi-plugins/mpegencoder/plugin_mpegencoder.cpp b/kipi-plugins/mpegencoder/plugin_mpegencoder.cpp
index c8321c9..f2305bd 100644
--- a/kipi-plugins/mpegencoder/plugin_mpegencoder.cpp
+++ b/kipi-plugins/mpegencoder/plugin_mpegencoder.cpp
@@ -29,7 +29,7 @@
 // Include files for KDE
 
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
diff --git a/kipi-plugins/picasawebexport/picasawebwindow.cpp b/kipi-plugins/picasawebexport/picasawebwindow.cpp
index 1aa1ade..b52bf83 100644
--- a/kipi-plugins/picasawebexport/picasawebwindow.cpp
+++ b/kipi-plugins/picasawebexport/picasawebwindow.cpp
@@ -42,7 +42,7 @@
 // KDE includes.
 
 #include <khelpmenu.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kapplication.h>
diff --git a/kipi-plugins/picasawebexport/plugin_picasawebexport.cpp b/kipi-plugins/picasawebexport/plugin_picasawebexport.cpp
index 512a232..a816d7a 100644
--- a/kipi-plugins/picasawebexport/plugin_picasawebexport.cpp
+++ b/kipi-plugins/picasawebexport/plugin_picasawebexport.cpp
@@ -30,7 +30,7 @@ extern "C"
 // KDE includes.
 
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
 #include <tdeconfig.h>
diff --git a/kipi-plugins/printwizard/frmprintwizard.cpp b/kipi-plugins/printwizard/frmprintwizard.cpp
index e550a5c..51de9b7 100644
--- a/kipi-plugins/printwizard/frmprintwizard.cpp
+++ b/kipi-plugins/printwizard/frmprintwizard.cpp
@@ -40,7 +40,7 @@ extern "C"
 #include <kprogress.h>
 #include <kprocess.h>
 #include <ksimpleconfig.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <kprinter.h>
 #include <klocale.h>
 #include <klineedit.h>
@@ -55,9 +55,9 @@ extern "C"
 #include <kaboutdata.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tdeversion.h>
-#include <kfontcombo.h>
+#include <tdefontcombo.h>
 #include <kcolorcombo.h>
 
 // Local includes
diff --git a/kipi-plugins/printwizard/frmprintwizardbase.ui b/kipi-plugins/printwizard/frmprintwizardbase.ui
index 6b71b62..23befd1 100644
--- a/kipi-plugins/printwizard/frmprintwizardbase.ui
+++ b/kipi-plugins/printwizard/frmprintwizardbase.ui
@@ -2317,13 +2317,13 @@ Click the 'Next' button to begin.</string>
     <includehint>kcombobox.h</includehint>
     <includehint>kcombobox.h</includehint>
     <includehint>klineedit.h</includehint>
-    <includehint>kfontcombo.h</includehint>
+    <includehint>tdefontcombo.h</includehint>
     <includehint>klineedit.h</includehint>
     <includehint>kcolorcombo.h</includehint>
     <includehint>kurllabel.h</includehint>
     <includehint>klineedit.h</includehint>
     <includehint>kpushbutton.h</includehint>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
     <includehint>cropframe.h</includehint>
     <includehint>kprogress.h</includehint>
 </includehints>
diff --git a/kipi-plugins/printwizard/plugin_printwizard.cpp b/kipi-plugins/printwizard/plugin_printwizard.cpp
index 9271d4b..908e2c1 100644
--- a/kipi-plugins/printwizard/plugin_printwizard.cpp
+++ b/kipi-plugins/printwizard/plugin_printwizard.cpp
@@ -32,7 +32,7 @@ extern "C"
 // Include files for KDE
 
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
diff --git a/kipi-plugins/rawconverter/batchdialog.cpp b/kipi-plugins/rawconverter/batchdialog.cpp
index a5e0c9d..1416c27 100644
--- a/kipi-plugins/rawconverter/batchdialog.cpp
+++ b/kipi-plugins/rawconverter/batchdialog.cpp
@@ -51,7 +51,7 @@ extern "C"
 
 #include <kcursor.h>
 #include <kdebug.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kurl.h>
 #include <kiconloader.h>
@@ -61,7 +61,7 @@ extern "C"
 #include <tdeconfig.h>
 #include <kapplication.h>
 #include <khelpmenu.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 
 // LibKDcraw includes.
diff --git a/kipi-plugins/rawconverter/clistviewitem.h b/kipi-plugins/rawconverter/clistviewitem.h
index 739f105..139fd20 100644
--- a/kipi-plugins/rawconverter/clistviewitem.h
+++ b/kipi-plugins/rawconverter/clistviewitem.h
@@ -31,7 +31,7 @@
 
 // KDE includes.
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 class TQPixmap;
 
diff --git a/kipi-plugins/rawconverter/plugin_rawconverter.cpp b/kipi-plugins/rawconverter/plugin_rawconverter.cpp
index ea6f894..86bc405 100644
--- a/kipi-plugins/rawconverter/plugin_rawconverter.cpp
+++ b/kipi-plugins/rawconverter/plugin_rawconverter.cpp
@@ -43,7 +43,7 @@ extern "C"
 // KDE includes.
 
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
diff --git a/kipi-plugins/rawconverter/singledialog.cpp b/kipi-plugins/rawconverter/singledialog.cpp
index d3f5e3a..e5fcd11 100644
--- a/kipi-plugins/rawconverter/singledialog.cpp
+++ b/kipi-plugins/rawconverter/singledialog.cpp
@@ -56,7 +56,7 @@ extern "C"
 #include <kapplication.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 
diff --git a/kipi-plugins/sendimages/listimageserrordialog.cpp b/kipi-plugins/sendimages/listimageserrordialog.cpp
index d89ee69..5e2622e 100644
--- a/kipi-plugins/sendimages/listimageserrordialog.cpp
+++ b/kipi-plugins/sendimages/listimageserrordialog.cpp
@@ -33,7 +33,7 @@
 // KDElib includes
 
 #include <klocale.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kurl.h>
 #include <kstandarddirs.h>
 
diff --git a/kipi-plugins/sendimages/plugin_sendimages.cpp b/kipi-plugins/sendimages/plugin_sendimages.cpp
index 96d5f85..6ec2026 100644
--- a/kipi-plugins/sendimages/plugin_sendimages.cpp
+++ b/kipi-plugins/sendimages/plugin_sendimages.cpp
@@ -32,7 +32,7 @@ extern "C"
 #include <klocale.h>
 #include <kapplication.h>
 #include <kglobal.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
 #include <tdeconfig.h>
diff --git a/kipi-plugins/sendimages/sendimagesdialog.cpp b/kipi-plugins/sendimages/sendimagesdialog.cpp
index ca54701..59a89bd 100644
--- a/kipi-plugins/sendimages/sendimagesdialog.cpp
+++ b/kipi-plugins/sendimages/sendimagesdialog.cpp
@@ -59,7 +59,7 @@
 #include <ksqueezedtextlabel.h>
 #include <kapplication.h>
 #include <khelpmenu.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kurlrequester.h>
 
 // LibKipi includes.
diff --git a/kipi-plugins/sendimages/sendimagesdialog.h b/kipi-plugins/sendimages/sendimagesdialog.h
index a3dc148..81978aa 100644
--- a/kipi-plugins/sendimages/sendimagesdialog.h
+++ b/kipi-plugins/sendimages/sendimagesdialog.h
@@ -31,7 +31,7 @@
 // KDE includes.
 
 #include <kdialogbase.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <tdeio/previewjob.h>
 #include <kurl.h>
 
diff --git a/kipi-plugins/simpleviewerexport/firstrundlg.cpp b/kipi-plugins/simpleviewerexport/firstrundlg.cpp
index 8f6b016..26bc257 100644
--- a/kipi-plugins/simpleviewerexport/firstrundlg.cpp
+++ b/kipi-plugins/simpleviewerexport/firstrundlg.cpp
@@ -36,7 +36,7 @@
 #include <kurllabel.h>
 #include <kurlrequester.h>
 #include <khelpmenu.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kapplication.h>
 
 // KIPI include files
diff --git a/kipi-plugins/simpleviewerexport/plugin_simpleviewer.cpp b/kipi-plugins/simpleviewerexport/plugin_simpleviewer.cpp
index 83c7d84..52cf607 100644
--- a/kipi-plugins/simpleviewerexport/plugin_simpleviewer.cpp
+++ b/kipi-plugins/simpleviewerexport/plugin_simpleviewer.cpp
@@ -24,7 +24,7 @@
 // KDE includes.
 
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
 #include <tdeconfig.h>
diff --git a/kipi-plugins/simpleviewerexport/svedialog.cpp b/kipi-plugins/simpleviewerexport/svedialog.cpp
index 9d9c773..f6faf78 100644
--- a/kipi-plugins/simpleviewerexport/svedialog.cpp
+++ b/kipi-plugins/simpleviewerexport/svedialog.cpp
@@ -41,7 +41,7 @@
 #include <klineedit.h>
 #include <klocale.h>
 #include <khelpmenu.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
 #include <knuminput.h>
diff --git a/kipi-plugins/slideshow/listimageitems.cpp b/kipi-plugins/slideshow/listimageitems.cpp
index 5fd3b7a..e5d20ae 100644
--- a/kipi-plugins/slideshow/listimageitems.cpp
+++ b/kipi-plugins/slideshow/listimageitems.cpp
@@ -32,7 +32,7 @@
 
 // KDE includes
 
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <kurl.h>
 
 // Local includes
diff --git a/kipi-plugins/slideshow/listimageitems.h b/kipi-plugins/slideshow/listimageitems.h
index 20a6641..4242b33 100644
--- a/kipi-plugins/slideshow/listimageitems.h
+++ b/kipi-plugins/slideshow/listimageitems.h
@@ -31,7 +31,7 @@
 
 // KDE includes
 
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <kurl.h>
 
 namespace KIPISlideShowPlugin
diff --git a/kipi-plugins/slideshow/plugin_slideshow.cpp b/kipi-plugins/slideshow/plugin_slideshow.cpp
index 398b60a..955a3ee 100644
--- a/kipi-plugins/slideshow/plugin_slideshow.cpp
+++ b/kipi-plugins/slideshow/plugin_slideshow.cpp
@@ -42,7 +42,7 @@ extern "C"
  // KDE includes.
  
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
diff --git a/kipi-plugins/slideshow/slideshowconfig.cpp b/kipi-plugins/slideshow/slideshowconfig.cpp
index 526bfec..d5e38e7 100644
--- a/kipi-plugins/slideshow/slideshowconfig.cpp
+++ b/kipi-plugins/slideshow/slideshowconfig.cpp
@@ -48,9 +48,9 @@
 #include <kaboutdata.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
 #include <kcolorbutton.h>
 #include <tdeio/previewjob.h>
 #include <kurl.h>
diff --git a/kipi-plugins/slideshow/slideshowconfigbase.ui b/kipi-plugins/slideshow/slideshowconfigbase.ui
index bde38be..0a36605 100644
--- a/kipi-plugins/slideshow/slideshowconfigbase.ui
+++ b/kipi-plugins/slideshow/slideshowconfigbase.ui
@@ -1482,12 +1482,12 @@ Ken Burns effect doesn't use this cache mechanism.</string>
     <include location="global" impldecl="in declaration">libkipi/interface.h</include>
     <include location="global" impldecl="in declaration">kprocess.h</include>
     <include location="global" impldecl="in declaration">tdeio/previewjob.h</include>
-    <include location="global" impldecl="in declaration">klistbox.h</include>
+    <include location="global" impldecl="in declaration">tdelistbox.h</include>
     <include location="global" impldecl="in implementation">klineedit.h</include>
     <include location="global" impldecl="in implementation">libkipi/interface.h</include>
     <include location="global" impldecl="in implementation">kprocess.h</include>
     <include location="global" impldecl="in implementation">tdeio/previewjob.h</include>
-    <include location="global" impldecl="in implementation">klistbox.h</include>
+    <include location="global" impldecl="in implementation">tdelistbox.h</include>
 </includes>
 <Q_SLOTS>
     <slot access="protected">slotOpenGLToggled()</slot>
@@ -1515,7 +1515,7 @@ Ken Burns effect doesn't use this cache mechanism.</string>
 <includehints>
     <includehint>kdialog.h</includehint>
     <includehint>listimageitems.h</includehint>
-    <includehint>kfontdialog.h</includehint>
+    <includehint>tdefontdialog.h</includehint>
     <includehint>kcolorbutton.h</includehint>
     <includehint>kcolorbutton.h</includehint>
 </includehints>
diff --git a/kipi-plugins/sync/Makefile.am b/kipi-plugins/sync/Makefile.am
index ededf9a..60cc8e4 100644
--- a/kipi-plugins/sync/Makefile.am
+++ b/kipi-plugins/sync/Makefile.am
@@ -11,7 +11,7 @@ kipiplugin_sync_la_SOURCES = plugin_sync.cpp \
 		libkipi2/interface.cpp \
 		libkipi2/collection.cpp libkipi2/item.cpp \
 		sink.cpp sinkfactory.cpp sinks.cpp \
-		sinklist.cpp sinklistbase.ui \
+		sintdelist.cpp sintdelistbase.ui \
 		sinks/gallery/galleryform.cpp sinks/gallery/gallerysink.cpp \
 		sinks/gallery/gallerycollection.cpp sinks/gallery/galleryitem.cpp
 
diff --git a/kipi-plugins/sync/gallerywindow.cpp b/kipi-plugins/sync/gallerywindow.cpp
index 2ef56eb..b7abfcf 100644
--- a/kipi-plugins/sync/gallerywindow.cpp
+++ b/kipi-plugins/sync/gallerywindow.cpp
@@ -35,7 +35,7 @@
 
 #include <kaboutdata.h>
 #include <khelpmenu.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kapplication.h>
diff --git a/kipi-plugins/sync/plugin_sync.cpp b/kipi-plugins/sync/plugin_sync.cpp
index da687bd..cd227c7 100644
--- a/kipi-plugins/sync/plugin_sync.cpp
+++ b/kipi-plugins/sync/plugin_sync.cpp
@@ -19,7 +19,7 @@
 
 // KDE includes.
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
 #include <tdeconfig.h>
@@ -34,7 +34,7 @@
 // Local includes.
 #include "plugin_sync.h"
 #include "sinks.h"
-//#include "sinklist.h"
+//#include "sintdelist.h"
 //#include "gallerywindow.h"
 //#include "galleryconfig.h"
 
diff --git a/kipi-plugins/sync/sintdelist.cpp b/kipi-plugins/sync/sintdelist.cpp
index 0a99330..c54febd 100644
--- a/kipi-plugins/sync/sintdelist.cpp
+++ b/kipi-plugins/sync/sintdelist.cpp
@@ -1,5 +1,5 @@
 /* ============================================================
- * File  : sinklist.cpp
+ * File  : sintdelist.cpp
  * Author: Colin Guthrie <kde@colin.guthr.ie>
  * Date  : 2006-09-04
  * Copyright 2006 by Colin Guthrie <kde@colin.guthr.ie>
@@ -28,7 +28,7 @@
 // Local includes.
 
 #include "sinks.h"
-#include "sinklist.h"
+#include "sintdelist.h"
 //#include "sintdeconfig.h"
 
 namespace KIPISyncPlugin
@@ -165,5 +165,5 @@ void SinkList::buttonRemove_clicked(void)
 
 }
 
-#include "sinklist.moc"
+#include "sintdelist.moc"
 
diff --git a/kipi-plugins/sync/sintdelist.h b/kipi-plugins/sync/sintdelist.h
index a5d85b2..3403e68 100644
--- a/kipi-plugins/sync/sintdelist.h
+++ b/kipi-plugins/sync/sintdelist.h
@@ -1,5 +1,5 @@
 /* ============================================================
- * File  : sinklist.h
+ * File  : sintdelist.h
  * Author: Colin Guthrie <kde@colin.guthr.ie>
  * Date  : 2006-09-04
  * Copyright 2006 by Colin Guthrie <kde@colin.guthr.ie>
@@ -18,7 +18,7 @@
 #ifndef SINKLIST_H
 #define SINKLIST_H
 
-#include "sinklistbase.h"
+#include "sintdelistbase.h"
 
 class TQWidget;
 
diff --git a/kipi-plugins/timeadjust/plugin_timeadjust.cpp b/kipi-plugins/timeadjust/plugin_timeadjust.cpp
index c0a4ea8..d6c4ef0 100644
--- a/kipi-plugins/timeadjust/plugin_timeadjust.cpp
+++ b/kipi-plugins/timeadjust/plugin_timeadjust.cpp
@@ -24,7 +24,7 @@
 // KDE includes.
 
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
diff --git a/kipi-plugins/timeadjust/timeadjustdialog.cpp b/kipi-plugins/timeadjust/timeadjustdialog.cpp
index adf6a00..775d017 100644
--- a/kipi-plugins/timeadjust/timeadjustdialog.cpp
+++ b/kipi-plugins/timeadjust/timeadjustdialog.cpp
@@ -56,7 +56,7 @@ extern "C"
 #include <kaboutdata.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <kdatetimewidget.h>
 #include <tdeconfig.h>
diff --git a/kipi-plugins/wallpaper/plugin_wallpaper.cpp b/kipi-plugins/wallpaper/plugin_wallpaper.cpp
index 0acfdd8..589bfce 100644
--- a/kipi-plugins/wallpaper/plugin_wallpaper.cpp
+++ b/kipi-plugins/wallpaper/plugin_wallpaper.cpp
@@ -26,7 +26,7 @@
 // Include files for KDE
 
  #include <klocale.h>
- #include <kaction.h>
+ #include <tdeaction.h>
  #include <kgenericfactory.h>
  #include <klibloader.h>
  #include <tdeconfig.h>