diff --git a/src/flowcodeview.cpp b/src/flowcodeview.cpp
index dc58a38..c04ab6d 100644
--- a/src/flowcodeview.cpp
+++ b/src/flowcodeview.cpp
@@ -15,7 +15,7 @@
 
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tqwhatsthis.h>
 
 FlowCodeView::FlowCodeView( FlowCodeDocument * flowCodeDocument, ViewContainer *viewContainer, uint viewAreaId, const char *name )
diff --git a/src/flowparts/pinmapping.cpp b/src/flowparts/pinmapping.cpp
index 9159b09..80273df 100644
--- a/src/flowparts/pinmapping.cpp
+++ b/src/flowparts/pinmapping.cpp
@@ -21,7 +21,7 @@
 
 #include <kdebug.h>
 #include <klocale.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 
 #include <tqaccel.h>
 #include <tqapplication.h>
diff --git a/src/gui/itemselector.h b/src/gui/itemselector.h
index 72df34f..18cf387 100644
--- a/src/gui/itemselector.h
+++ b/src/gui/itemselector.h
@@ -11,7 +11,7 @@
 #ifndef ITEMSELECTOR_H
 #define ITEMSELECTOR_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include <tqpixmap.h>
 #include <tqstring.h>
diff --git a/src/gui/linkeroptionswidget.ui b/src/gui/linkeroptionswidget.ui
index e353f5e..c97dbbc 100644
--- a/src/gui/linkeroptionswidget.ui
+++ b/src/gui/linkeroptionswidget.ui
@@ -172,7 +172,7 @@
     <includehint>kcombobox.h</includehint>
     <includehint>klineedit.h</includehint>
     <includehint>klineedit.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>keditlistbox.h</includehint>
     <includehint>klineedit.h</includehint>
 </includehints>
diff --git a/src/gui/oscilloscopeview.cpp b/src/gui/oscilloscopeview.cpp
index b7673a7..e827814 100644
--- a/src/gui/oscilloscopeview.cpp
+++ b/src/gui/oscilloscopeview.cpp
@@ -18,7 +18,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kglobal.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tqcheckbox.h>
 #include <tqcursor.h>
 #include <tqevent.h>
diff --git a/src/gui/plvitem.cpp b/src/gui/plvitem.cpp
index 24b12ac..a94af4c 100644
--- a/src/gui/plvitem.cpp
+++ b/src/gui/plvitem.cpp
@@ -11,7 +11,7 @@
 #include "plvitem.h"
 #include "variant.h"
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqpainter.h>
 #include <tqvariant.h>
 
diff --git a/src/gui/plvitem.h b/src/gui/plvitem.h
index 5dd653c..78afcb9 100644
--- a/src/gui/plvitem.h
+++ b/src/gui/plvitem.h
@@ -11,7 +11,7 @@
 #ifndef PLVITEM_H
 #define PLVITEM_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqstring.h>
 #include <tqguardedptr.h>
 #include <tqobject.h>
diff --git a/src/gui/propertieslistview.h b/src/gui/propertieslistview.h
index dd75276..70b2180 100644
--- a/src/gui/propertieslistview.h
+++ b/src/gui/propertieslistview.h
@@ -11,7 +11,7 @@
 #ifndef PROPERTIESLISTVIEW_H
 #define PROPERTIESLISTVIEW_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqmap.h>
 
 class CNItemGroup;
diff --git a/src/gui/symbolviewer.h b/src/gui/symbolviewer.h
index 68826a4..d0ab0d7 100644
--- a/src/gui/symbolviewer.h
+++ b/src/gui/symbolviewer.h
@@ -14,7 +14,7 @@
 #ifndef SYMBOLVIEWER_H
 #define SYMBOLVIEWER_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqguardedptr.h>
 
 class KComboBox;
diff --git a/src/icnview.cpp b/src/icnview.cpp
index 6954cb6..43c77aa 100644
--- a/src/icnview.cpp
+++ b/src/icnview.cpp
@@ -17,7 +17,7 @@
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 ICNView::ICNView( ICNDocument *icnDocument, ViewContainer *viewContainer, uint viewAreaId, const char *name )
 	: ItemView( icnDocument, viewContainer, viewAreaId, name )
diff --git a/src/itemdocument.cpp b/src/itemdocument.cpp
index 935d101..5d4a8a7 100644
--- a/src/itemdocument.cpp
+++ b/src/itemdocument.cpp
@@ -30,7 +30,7 @@
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kprinter.h>
 #include <tqcheckbox.h>
 #include <tqclipboard.h>
diff --git a/src/iteminterface.cpp b/src/iteminterface.cpp
index 08f6529..3e94b1a 100644
--- a/src/iteminterface.cpp
+++ b/src/iteminterface.cpp
@@ -25,7 +25,7 @@
 #include <klineedit.h>
 #include <knuminput.h>
 #include <kurlrequester.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <tqapplication.h>
 #include <tqlabel.h>
 #include <tqcheckbox.h>
diff --git a/src/itemview.cpp b/src/itemview.cpp
index 0e3eebf..34db2b6 100644
--- a/src/itemview.cpp
+++ b/src/itemview.cpp
@@ -19,10 +19,10 @@
 #include "ktechlab.h"
 #include "core/ktlconfig.h"
 
-#include <kaccel.h>
+#include <tdeaccel.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kurldrag.h>
 
 #include <cmath>
diff --git a/src/katemdi.cpp b/src/katemdi.cpp
index ea18af7..22e0cbd 100644
--- a/src/katemdi.cpp
+++ b/src/katemdi.cpp
@@ -2,7 +2,7 @@
    Copyright (C) 2005 Christoph Cullmann <cullmann@kde.org>
    Copyright (C) 2002, 2003 Joseph Wenninger <jowenn@kde.org>
 
-   GUIClient partly based on ktoolbarhandler.cpp: Copyright (C) 2002 Simon Hausmann <hausmann@kde.org>
+   GUIClient partly based on tdetoolbarhandler.cpp: Copyright (C) 2002 Simon Hausmann <hausmann@kde.org>
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
@@ -28,7 +28,7 @@
 #include <klocale.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 
 namespace KateMDI {
@@ -108,7 +108,7 @@ GUIClient::GUIClient ( MainWindow *mw )
   connect( m_mw->guiFactory(), TQT_SIGNAL( clientAdded( KXMLGUIClient * ) ),
            this, TQT_SLOT( clientAdded( KXMLGUIClient * ) ) );
 
-  if (actionCollection()->kaccel()==0)
+  if (actionCollection()->tdeaccel()==0)
     actionCollection()->setWidget(m_mw);
 
 
diff --git a/src/ktechlab.cpp b/src/ktechlab.cpp
index 69041cb..a76b737 100644
--- a/src/ktechlab.cpp
+++ b/src/ktechlab.cpp
@@ -39,7 +39,7 @@
 #include <tqtoolbutton.h>
 #include <tqwhatsthis.h>
 
-#include <kaccel.h>
+#include <tdeaccel.h>
 #include <kapplication.h>
 #include <kdebug.h>
 #include <kedittoolbar.h>
@@ -49,7 +49,7 @@
 #include <kkeydialog.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <ktabwidget.h> 
 #include <kurldrag.h>
diff --git a/src/recentfilesaction.cpp b/src/recentfilesaction.cpp
index 7194038..8ed5e80 100644
--- a/src/recentfilesaction.cpp
+++ b/src/recentfilesaction.cpp
@@ -11,7 +11,7 @@
 #include "recentfilesaction.h"
 
 #include <tdeconfig.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
 
diff --git a/src/recentfilesaction.h b/src/recentfilesaction.h
index d56baf8..89bc5ed 100644
--- a/src/recentfilesaction.h
+++ b/src/recentfilesaction.h
@@ -11,10 +11,10 @@
 #ifndef RECENTFILESACTION_H
 #define RECENTFILESACTION_H
 
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 
 /**
-Taken mainly from tdelibs/tdeui/kactionclasses.[cpp/h], author Michael Koch.
+Taken mainly from tdelibs/tdeui/tdeactionclasses.[cpp/h], author Michael Koch.
 Adapted to work around strange bug occuring.
 */
 class RecentFilesAction : public TDESelectAction
diff --git a/src/textview.cpp b/src/textview.cpp
index 13a5069..622efe5 100644
--- a/src/textview.cpp
+++ b/src/textview.cpp
@@ -30,7 +30,7 @@
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 
 #include <tqapplication.h>