diff --git a/conduits/abbrowserconduit/abbrowser-conduit.cc b/conduits/abbrowserconduit/abbrowser-conduit.cc
index 93e15ac..b9f2bce 100644
--- a/conduits/abbrowserconduit/abbrowser-conduit.cc
+++ b/conduits/abbrowserconduit/abbrowser-conduit.cc
@@ -38,8 +38,8 @@
 #include <tqfile.h>
 #include <tqregexp.h>
 
-#include <kabc/stdaddressbook.h>
-#include <kabc/resourcefile.h>
+#include <tdeabc/stdaddressbook.h>
+#include <tdeabc/resourcefile.h>
 #include <tdeio/netaccess.h>
 #include <ksavefile.h>
 
diff --git a/conduits/abbrowserconduit/abbrowser-conduit.h b/conduits/abbrowserconduit/abbrowser-conduit.h
index ee73d4f..61db74b 100644
--- a/conduits/abbrowserconduit/abbrowser-conduit.h
+++ b/conduits/abbrowserconduit/abbrowser-conduit.h
@@ -30,7 +30,7 @@
 */
 
 
-#include <kabc/addressbook.h>
+#include <tdeabc/addressbook.h>
 
 #include <pilotAddress.h>
 #include <plugin.h>
diff --git a/conduits/abbrowserconduit/abbrowserconduit.kcfg b/conduits/abbrowserconduit/abbrowserconduit.kcfg
index c02aea1..3295dec 100644
--- a/conduits/abbrowserconduit/abbrowserconduit.kcfg
+++ b/conduits/abbrowserconduit/abbrowserconduit.kcfg
@@ -13,7 +13,7 @@
         <default>eAbookFile</default>
     </entry>
     <entry name="FileName" type="Path">
-        <default>$HOME/.trinity/share/apps/kabc/std.vcf</default>
+        <default>$HOME/.trinity/share/apps/tdeabc/std.vcf</default>
     </entry>
 		<entry name="ArchiveDeleted" type="Bool">
         <default>true</default>
diff --git a/conduits/abbrowserconduit/kabcRecord.cc b/conduits/abbrowserconduit/kabcRecord.cc
index a02b83b..210ad9d 100644
--- a/conduits/abbrowserconduit/kabcRecord.cc
+++ b/conduits/abbrowserconduit/kabcRecord.cc
@@ -35,8 +35,8 @@
 
 #include <tqregexp.h>
 
-#include <kglobal.h>
-#include <kabc/addressee.h>
+#include <tdeglobal.h>
+#include <tdeabc/addressee.h>
 
 #include "kabcRecord.h"
 
diff --git a/conduits/abbrowserconduit/kabcRecord.h b/conduits/abbrowserconduit/kabcRecord.h
index f27f0b1..4a862db 100644
--- a/conduits/abbrowserconduit/kabcRecord.h
+++ b/conduits/abbrowserconduit/kabcRecord.h
@@ -35,7 +35,7 @@
 
 #include <tqvaluevector.h>
 
-#include <kabc/phonenumber.h>
+#include <tdeabc/phonenumber.h>
 
 #include "pilotAddress.h"
 
diff --git a/conduits/docconduit/doc-conflictdialog.cc b/conduits/docconduit/doc-conflictdialog.cc
index 773b4e1..59df40b 100644
--- a/conduits/docconduit/doc-conflictdialog.cc
+++ b/conduits/docconduit/doc-conflictdialog.cc
@@ -32,7 +32,7 @@
 #include <tqpushbutton.h>
 #include <tqlayout.h>
 #include <tqbuttongroup.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqtimer.h>
 #include <tqtable.h>
 #include <tqcombobox.h>
diff --git a/conduits/docconduit/kpalmdoc_dlg.cc b/conduits/docconduit/kpalmdoc_dlg.cc
index c8b17d9..45fc3f1 100644
--- a/conduits/docconduit/kpalmdoc_dlg.cc
+++ b/conduits/docconduit/kpalmdoc_dlg.cc
@@ -38,12 +38,12 @@
 #include <tqlabel.h>
 #include <tqcombobox.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <tdeaboutapplication.h>
 #include <tdeapplication.h>
 #include <kurlrequester.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kcharsets.h>
 
 #include <pilotLocalDatabase.h>
diff --git a/conduits/notepadconduit/notepad-factory.cc b/conduits/notepadconduit/notepad-factory.cc
index d2e6e9f..2f81414 100644
--- a/conduits/notepadconduit/notepad-factory.cc
+++ b/conduits/notepadconduit/notepad-factory.cc
@@ -32,7 +32,7 @@
 #include <kinstance.h>
 #include <tdeaboutdata.h>
 #include <kurlrequester.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqlineedit.h>
 
 #include "pluginfactory.h"
diff --git a/conduits/popmail/popmail-conduit.cc b/conduits/popmail/popmail-conduit.cc
index 8e277df..7193cd4 100644
--- a/conduits/popmail/popmail-conduit.cc
+++ b/conduits/popmail/popmail-conduit.cc
@@ -65,12 +65,12 @@ unsigned long version_conduit_popmail = Pilot::PLUGIN_API;
 #include <tqtextcodec.h>
 
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <ksock.h>
 #include <tdeconfig.h>
 #include <ksimpleconfig.h>
 #include <dcopclient.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include "pilotRecord.h"
 #include "pilotSerialDatabase.h"
diff --git a/conduits/vcalconduit/vcal-conduitbase.cc b/conduits/vcalconduit/vcal-conduitbase.cc
index a21aabb..15cfcdc 100644
--- a/conduits/vcalconduit/vcal-conduitbase.cc
+++ b/conduits/vcalconduit/vcal-conduitbase.cc
@@ -36,7 +36,7 @@
 #include <tqtimer.h>
 #include <tqfile.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeio/netaccess.h>
 
 #include "libkcal/calendar.h"
diff --git a/kpilot/Makefile-standalone b/kpilot/Makefile-standalone
index 7eb8dd0..e8712ec 100644
--- a/kpilot/Makefile-standalone
+++ b/kpilot/Makefile-standalone
@@ -133,7 +133,7 @@ kpilotDaemon.tar.gz :
 	-rmdir $(DAEMON_DISTDIR)
 
 conduitConfigDialog_base.cc : conduitConfigDialog_base.h conduitConfigDialog_base.ui
-	echo '#include <klocale.h>' > $@
+	echo '#include <tdelocale.h>' > $@
 	$(UIC) -tr i18n -i conduitConfigDialog_base.h conduitConfigDialog_base.ui | \
 		sed -e "s,i18n( \"\" ),QString::null,g" >> $@
 	echo '#include "conduitConfigDialog_base.moc"' >> $@
@@ -142,7 +142,7 @@ conduitConfigDialog_base.h : conduitConfigDialog_base.ui
 	$(UIC) -o $@ $<
 
 kpilotConfigDialog_base.cc : kpilotConfigDialog_base.h kpilotConfigDialog_base.ui
-	echo '#include <klocale.h>' > $@
+	echo '#include <tdelocale.h>' > $@
 	$(UIC) -tr i18n -i kpilotConfigDialog_base.h kpilotConfigDialog_base.ui | \
 		sed -e "s,i18n( \"\" ),QString::null,g" >> $@
 	echo '#include "kpilotConfigDialog_base.moc"' >> $@
diff --git a/kpilot/addressWidget.cc b/kpilot/addressWidget.cc
index 987cd17..f8bd65d 100644
--- a/kpilot/addressWidget.cc
+++ b/kpilot/addressWidget.cc
@@ -53,7 +53,7 @@
 #include <tqregexp.h>
 
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <tdefiledialog.h>
 
diff --git a/kpilot/conduitConfigDialog.cc b/kpilot/conduitConfigDialog.cc
index 45b9c35..5fd8494 100644
--- a/kpilot/conduitConfigDialog.cc
+++ b/kpilot/conduitConfigDialog.cc
@@ -47,8 +47,8 @@
 #include <kservicetype.h>
 #include <kuserprofile.h>
 #include <kprocess.h>
-#include <kmessagebox.h>
-#include <kglobal.h>
+#include <tdemessagebox.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <klibloader.h>
 #include <kseparator.h>
diff --git a/kpilot/datebookWidget.cc b/kpilot/datebookWidget.cc
index 88d0a70..fedfd6d 100644
--- a/kpilot/datebookWidget.cc
+++ b/kpilot/datebookWidget.cc
@@ -37,7 +37,7 @@
 
 #include <tdelistview.h>
 #include <kdatepicker.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "datebookWidget.moc"
 
diff --git a/kpilot/dbAppInfoEditor.cc b/kpilot/dbAppInfoEditor.cc
index c1e65c5..8fe5728 100644
--- a/kpilot/dbAppInfoEditor.cc
+++ b/kpilot/dbAppInfoEditor.cc
@@ -30,7 +30,7 @@
 #include <tqtextedit.h>
 #include <tqlabel.h>
 #include <kdialogbase.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "dbAppInfoEditor.h"
 
diff --git a/kpilot/dbFlagsEditor.cc b/kpilot/dbFlagsEditor.cc
index 89f14d0..e49690e 100644
--- a/kpilot/dbFlagsEditor.cc
+++ b/kpilot/dbFlagsEditor.cc
@@ -33,7 +33,7 @@
 #include <tqcheckbox.h>
 #include <kdatewidget.h>
 #include <ktimewidget.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "pilotRecord.h"
 #include "dbFlagsEditor.h"
diff --git a/kpilot/dbRecordEditor.cc b/kpilot/dbRecordEditor.cc
index 1b6ac32..6726f03 100644
--- a/kpilot/dbRecordEditor.cc
+++ b/kpilot/dbRecordEditor.cc
@@ -36,7 +36,7 @@
 #include <tqpushbutton.h>
 #include <tqlayout.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "pilotRecord.h"
 #include "dbRecordEditor.h"
diff --git a/kpilot/dbSelectionDialog.cc b/kpilot/dbSelectionDialog.cc
index 629e9f3..ed99c9b 100644
--- a/kpilot/dbSelectionDialog.cc
+++ b/kpilot/dbSelectionDialog.cc
@@ -33,7 +33,7 @@
 #include <tqlistview.h>
 #include <tqpushbutton.h>
 #include <tdelistview.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <klineedit.h>
 
diff --git a/kpilot/dbviewerWidget.cc b/kpilot/dbviewerWidget.cc
index 5a0aa25..609fbb5 100644
--- a/kpilot/dbviewerWidget.cc
+++ b/kpilot/dbviewerWidget.cc
@@ -46,7 +46,7 @@
 #include <ktextedit.h>
 #include <kpushbutton.h>
 #include <kcombobox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "listCat.h"
 #include "listItems.h"
diff --git a/kpilot/fileInstallWidget.cc b/kpilot/fileInstallWidget.cc
index 8ac31fe..9c0fc84 100644
--- a/kpilot/fileInstallWidget.cc
+++ b/kpilot/fileInstallWidget.cc
@@ -49,7 +49,7 @@
 #include <kurldrag.h>
 #include <kiconloader.h>
 #include <kiconview.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kurl.h>
 
 #include "kpilotConfig.h"
diff --git a/kpilot/fileInstaller.cc b/kpilot/fileInstaller.cc
index ffe9b8f..efecbde 100644
--- a/kpilot/fileInstaller.cc
+++ b/kpilot/fileInstaller.cc
@@ -38,11 +38,11 @@
 #include <tqstrlist.h>
 #include <tqdir.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
 #include <tdeio/netaccess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "fileInstaller.moc"
 
diff --git a/kpilot/hotSync.cc b/kpilot/hotSync.cc
index d09d96d..81625e9 100644
--- a/kpilot/hotSync.cc
+++ b/kpilot/hotSync.cc
@@ -50,10 +50,10 @@
 #include <tqstringlist.h>
 #include <tqthread.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "pilotUser.h"
 #include "pilotRecord.h"
diff --git a/kpilot/internalEditorAction.cc b/kpilot/internalEditorAction.cc
index d33eb6f..b0e0e3b 100644
--- a/kpilot/internalEditorAction.cc
+++ b/kpilot/internalEditorAction.cc
@@ -30,7 +30,7 @@
 #include <tqtimer.h>
 #include <tqlayout.h>
 #include <tqlabel.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdialog.h>
 #include <ktextedit.h>
 #include <kdialogbase.h>
diff --git a/kpilot/kpilot.cc b/kpilot/kpilot.cc
index d652131..5b6ce58 100644
--- a/kpilot/kpilot.cc
+++ b/kpilot/kpilot.cc
@@ -39,12 +39,12 @@
 
 #include <kjanuswidget.h>
 #include <kurl.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstatusbar.h>
 #include <tdeconfig.h>
 #include <twin.h>
 #include <kcombobox.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <kstandarddirs.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
diff --git a/kpilot/kpilotConfig.cc b/kpilot/kpilotConfig.cc
index e626a7b..6c3cbba 100644
--- a/kpilot/kpilotConfig.cc
+++ b/kpilot/kpilotConfig.cc
@@ -39,8 +39,8 @@
 #include <tdeconfig.h>
 #include <ksimpleconfig.h>
 #include <tdecmdlineargs.h>
-#include <kmessagebox.h>
-#include <kglobalsettings.h>
+#include <tdemessagebox.h>
+#include <tdeglobalsettings.h>
 
 #include "kpilotSettings.h"
 #include "kpilotConfig.h"
diff --git a/kpilot/kpilotConfigDialog.cc b/kpilot/kpilotConfigDialog.cc
index 27a7f6f..9223f37 100644
--- a/kpilot/kpilotConfigDialog.cc
+++ b/kpilot/kpilotConfigDialog.cc
@@ -44,10 +44,10 @@
 #include <tqspinbox.h>
 #include <tqfile.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kcharsets.h>
 #include <kstandarddirs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kurl.h>
 #include <tdeio/netaccess.h>
 
diff --git a/kpilot/kpilotConfigWizard.cc b/kpilot/kpilotConfigWizard.cc
index 94176f0..fa5fd09 100644
--- a/kpilot/kpilotConfigWizard.cc
+++ b/kpilot/kpilotConfigWizard.cc
@@ -33,9 +33,9 @@
 #include <tqcheckbox.h>
 #include <tqlineedit.h>
 
-#include <kmessagebox.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tdeconfigskeleton.h>
 
 #include "kpilotConfig.h"
diff --git a/kpilot/kpilotProbeDialog.cc b/kpilot/kpilotProbeDialog.cc
index 5327cb8..cdcd1c4 100644
--- a/kpilot/kpilotProbeDialog.cc
+++ b/kpilot/kpilotProbeDialog.cc
@@ -37,9 +37,9 @@
 #include <tqmap.h>
 #include <tqvaluelist.h>
 
-#include <kmessagebox.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tdeconfigskeleton.h>
 #include <tdeapplication.h>
 #include <kprogress.h>
diff --git a/kpilot/kroupware.cc b/kpilot/kroupware.cc
index f099851..289199f 100644
--- a/kpilot/kroupware.cc
+++ b/kpilot/kroupware.cc
@@ -33,7 +33,7 @@
 #include <tqfile.h>
 
 #include <dcopclient.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 
 #include <tdeapplication.h>
diff --git a/kpilot/listCat.cc b/kpilot/listCat.cc
index 6f32f35..9c2de3c 100644
--- a/kpilot/listCat.cc
+++ b/kpilot/listCat.cc
@@ -31,7 +31,7 @@
 #include "options.h"
 
 #include <tqpainter.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "listCat.moc"
 
diff --git a/kpilot/logWidget.cc b/kpilot/logWidget.cc
index a570f04..55db96a 100644
--- a/kpilot/logWidget.cc
+++ b/kpilot/logWidget.cc
@@ -42,11 +42,11 @@
 #include <tqtextstream.h>
 #include <tqpainter.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kprogress.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <pi-version.h>
 
diff --git a/kpilot/main-test.cc b/kpilot/main-test.cc
index 97efd97..68e6588 100644
--- a/kpilot/main-test.cc
+++ b/kpilot/main-test.cc
@@ -41,7 +41,7 @@
 #include <tqtimer.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
 #include <kservice.h>
diff --git a/kpilot/memoWidget.cc b/kpilot/memoWidget.cc
index d24ee4f..951a422 100644
--- a/kpilot/memoWidget.cc
+++ b/kpilot/memoWidget.cc
@@ -49,7 +49,7 @@
 #include <tqptrlist.h>
 
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
 #include <tdeversion.h>
 #include <ktextedit.h>
diff --git a/kpilot/todoWidget.cc b/kpilot/todoWidget.cc
index d457a94..1fbbaa9 100644
--- a/kpilot/todoWidget.cc
+++ b/kpilot/todoWidget.cc
@@ -39,7 +39,7 @@
 #include <tqwhatsthis.h>
 #include <tqtextcodec.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "kpilotConfig.h"
 #include "todoEditor.h"
diff --git a/lib/idmapper.cc b/lib/idmapper.cc
index dc14072..ebd25aa 100644
--- a/lib/idmapper.cc
+++ b/lib/idmapper.cc
@@ -30,7 +30,7 @@
 #include <tqsqldatabase.h>
 #include <tqfile.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 
 class IDMapperPrivate
diff --git a/lib/kpilotdevicelink.cc b/lib/kpilotdevicelink.cc
index 54fa84a..ecad02a 100644
--- a/lib/kpilotdevicelink.cc
+++ b/lib/kpilotdevicelink.cc
@@ -52,7 +52,7 @@
 #include <tqsocketnotifier.h>
 
 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
 #include <tdeio/netaccess.h>
diff --git a/lib/kpilotlink.cc b/lib/kpilotlink.cc
index 098b688..b543fe7 100644
--- a/lib/kpilotlink.cc
+++ b/lib/kpilotlink.cc
@@ -53,7 +53,7 @@
 #include <tqthread.h>
 
 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
 #include <tdeio/netaccess.h>
diff --git a/lib/kpilotlocallink.cc b/lib/kpilotlocallink.cc
index cf301c7..b5ec450 100644
--- a/lib/kpilotlocallink.cc
+++ b/lib/kpilotlocallink.cc
@@ -53,7 +53,7 @@
 #include <tqthread.h>
 
 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
 #include <tdeio/netaccess.h>
diff --git a/lib/options.h b/lib/options.h
index d8dcc0c..0896af0 100644
--- a/lib/options.h
+++ b/lib/options.h
@@ -42,7 +42,7 @@
 
 #include <kdebug.h>
 #include <tdeversion.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #if !(KDE_IS_VERSION(3,4,0))
 #error "This is KPilot for (really) KDE 3.5 and won't compile with KDE < 3.4.0"
diff --git a/lib/pilot.cc b/lib/pilot.cc
index ef4054b..d15eb55 100644
--- a/lib/pilot.cc
+++ b/lib/pilot.cc
@@ -34,7 +34,7 @@
 #include <tqtextcodec.h>
 #include <tqmutex.h>
 #include <kcharsets.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "pilot.h"
 #include "pilotDatabase.h"
diff --git a/lib/pilotDatabase.cc b/lib/pilotDatabase.cc
index cc65895..f4a1b40 100644
--- a/lib/pilotDatabase.cc
+++ b/lib/pilotDatabase.cc
@@ -36,7 +36,7 @@
 
 #include <tqstringlist.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "pilotDatabase.h"
 #include "pilotRecord.h"
diff --git a/lib/pilotDateEntry.cc b/lib/pilotDateEntry.cc
index b11c057..58da804 100644
--- a/lib/pilotDateEntry.cc
+++ b/lib/pilotDateEntry.cc
@@ -35,7 +35,7 @@
 #include <tqnamespace.h>
 #include <tqregexp.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "pilotDateEntry.h"
 
diff --git a/lib/pilotLocalDatabase.cc b/lib/pilotLocalDatabase.cc
index 4946312..ea78ac0 100644
--- a/lib/pilotLocalDatabase.cc
+++ b/lib/pilotLocalDatabase.cc
@@ -45,7 +45,7 @@
 #include <tqvaluevector.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <ksavefile.h>
 
diff --git a/lib/pilotRecord.cc b/lib/pilotRecord.cc
index 59f055c..8d5940a 100644
--- a/lib/pilotRecord.cc
+++ b/lib/pilotRecord.cc
@@ -38,7 +38,7 @@
 
 #include <tqregexp.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kcharsets.h>
 
 #include "pilot.h"
diff --git a/lib/pilotSerialDatabase.cc b/lib/pilotSerialDatabase.cc
index d1d7ee9..a34e00c 100644
--- a/lib/pilotSerialDatabase.cc
+++ b/lib/pilotSerialDatabase.cc
@@ -36,9 +36,9 @@
 
 #include <tqfile.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "pilotRecord.h"
 #include "pilotSerialDatabase.h"
diff --git a/lib/pilotTodoEntry.cc b/lib/pilotTodoEntry.cc
index f91b6d5..9d52ed8 100644
--- a/lib/pilotTodoEntry.cc
+++ b/lib/pilotTodoEntry.cc
@@ -34,7 +34,7 @@
 #include <tqdatetime.h>
 #include <tqnamespace.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 
 
diff --git a/lib/plugin.cc b/lib/plugin.cc
index 7bb8e12..1013a34 100644
--- a/lib/plugin.cc
+++ b/lib/plugin.cc
@@ -51,11 +51,11 @@
 #include <tdeaboutapplication.h>
 #include <kactivelabel.h>
 #include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <kinstance.h>
 #include <klibloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kservice.h>
 #include <kservicetype.h>
 #include <kstandarddirs.h>
diff --git a/lib/recordConduit.h b/lib/recordConduit.h
index 259133a..d1499a5 100644
--- a/lib/recordConduit.h
+++ b/lib/recordConduit.h
@@ -28,7 +28,7 @@
 */
 
 #include <tqtimer.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "plugin.h"
 #include "pilot.h"
diff --git a/lib/syncAction.cc b/lib/syncAction.cc
index 2ca7361..65a7c7c 100644
--- a/lib/syncAction.cc
+++ b/lib/syncAction.cc
@@ -47,10 +47,10 @@
 #include <tqstyle.h>
 
 #include <kdialogbase.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "syncAction.moc"
 #include "kpilotlibSettings.h"
diff --git a/tests/exportdatebook.cc b/tests/exportdatebook.cc
index 2f6533b..45cfa01 100644
--- a/tests/exportdatebook.cc
+++ b/tests/exportdatebook.cc
@@ -31,7 +31,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 #include <tdeconfigskeleton.h>
 
diff --git a/tests/importaddresses.cc b/tests/importaddresses.cc
index 4d37fa4..7e21c77 100644
--- a/tests/importaddresses.cc
+++ b/tests/importaddresses.cc
@@ -31,11 +31,11 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 
-#include <kabc/addressbook.h>
-#include <kabc/resourcefile.h>
+#include <tdeabc/addressbook.h>
+#include <tdeabc/resourcefile.h>
 
 #include "pilot.h"
 #include "pilotLocalDatabase.h"
diff --git a/tests/importdatebook.cc b/tests/importdatebook.cc
index d3e83b6..99f81f2 100644
--- a/tests/importdatebook.cc
+++ b/tests/importdatebook.cc
@@ -31,7 +31,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 
 #include <libkcal/calendar.h>
diff --git a/tests/mergecalendars.cc b/tests/mergecalendars.cc
index 926b8a5..010755d 100644
--- a/tests/mergecalendars.cc
+++ b/tests/mergecalendars.cc
@@ -28,7 +28,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 #include <tdeconfigskeleton.h>
 
diff --git a/tests/testaddress.cc b/tests/testaddress.cc
index 1f5b466..c24101d 100644
--- a/tests/testaddress.cc
+++ b/tests/testaddress.cc
@@ -31,7 +31,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 
 #include "pilot.h"
diff --git a/tests/testcategories.cc b/tests/testcategories.cc
index e2d4b25..35d5cd3 100644
--- a/tests/testcategories.cc
+++ b/tests/testcategories.cc
@@ -31,7 +31,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 
 #include "pilotLocalDatabase.h"
diff --git a/tests/testdatabase.cc b/tests/testdatabase.cc
index fd397be..68b3965 100644
--- a/tests/testdatabase.cc
+++ b/tests/testdatabase.cc
@@ -31,7 +31,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 
 #include "pilotLocalDatabase.h"
diff --git a/tests/testdatebook.cc b/tests/testdatebook.cc
index 5852585..82cc46a 100644
--- a/tests/testdatebook.cc
+++ b/tests/testdatebook.cc
@@ -31,7 +31,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 
 #include "pilot.h"