Rename many classes and header files to avoid conflicts with KDE4

58 files changed, 196 insertions, 196 deletions

diff --git a/sip/tdecore/tdeaccel.sip b/sip/tdecore/tdeaccel.sip
index dfce48f..7522118 100644
--- a/sip/tdecore/tdeaccel.sip
+++ b/sip/tdecore/tdeaccel.sip
@@ -27,7 +27,7 @@
 class TDEAccel : TQAccel
 {
 %TypeHeaderCode
-#include <kaccel.h>
+#include <tdeaccel.h>
 %End
 
 
@@ -161,7 +161,7 @@ public:
 //converts a Python dict of int:TQString
 {
 %TypeHeaderCode
-#include <kaccel.h>
+#include <tdeaccel.h>
 %End
 
 %ConvertFromTypeCode
diff --git a/sip/tdecore/tdeaccelaction.sip b/sip/tdecore/tdeaccelaction.sip
index 22e14ed..dff7dc4 100644
--- a/sip/tdecore/tdeaccelaction.sip
+++ b/sip/tdecore/tdeaccelaction.sip
@@ -27,7 +27,7 @@
 class TDEAccelAction
 {
 %TypeHeaderCode
-#include <kaccelaction.h>
+#include <tdeaccelaction.h>
 %End
 
 
@@ -76,7 +76,7 @@ protected:
 class TDEAccelActions
 {
 %TypeHeaderCode
-#include <kaccelaction.h>
+#include <tdeaccelaction.h>
 %End
 
 
diff --git a/sip/tdecore/tdeaccelbase.sip b/sip/tdecore/tdeaccelbase.sip
index 20139e5..ba8205a 100644
--- a/sip/tdecore/tdeaccelbase.sip
+++ b/sip/tdecore/tdeaccelbase.sip
@@ -27,7 +27,7 @@
 class TDEAccelBase
 {
 %TypeHeaderCode
-#include <kaccelbase.h>
+#include <tdeaccelbase.h>
 %End
 
 
diff --git a/sip/tdecore/tdecoremod.sip.in b/sip/tdecore/tdecoremod.sip.in
index 28b89d6..09aeacb 100644
--- a/sip/tdecore/tdecoremod.sip.in
+++ b/sip/tdecore/tdecoremod.sip.in
@@ -33,9 +33,9 @@
 
 %Include bytearray.sip
 %Include kaboutdata.sip
-%Include kaccel.sip
-%Include kaccelaction.sip
-%Include kaccelbase.sip
+%Include tdeaccel.sip
+%Include tdeaccelaction.sip
+%Include tdeaccelbase.sip
 %Include kallocator.sip
 %Include kapplication.sip
 %Include kasyncio.sip
@@ -79,13 +79,13 @@
 %Include krootprop.sip
 %Include ksavefile.sip
 %Include ksharedptr.sip
-%Include kshortcut.sip
-%Include kshortcutlist.sip
+%Include tdeshortcut.sip
+%Include tdeshortcutlist.sip
 %Include ksimpleconfig.sip
 %Include ksock.sip
 %Include kstartupinfo.sip
 %Include kstaticdeleter.sip
-%Include kstdaccel.sip
+%Include tdestdaccel.sip
 %Include kstddirs.sip
 %Include kstringhandler.sip
 %Include ktempdir.sip
diff --git a/sip/tdecore/tdeshortcut.sip b/sip/tdecore/tdeshortcut.sip
index 4eb2d03..14b859b 100644
--- a/sip/tdecore/tdeshortcut.sip
+++ b/sip/tdecore/tdeshortcut.sip
@@ -27,7 +27,7 @@
 class KKey
 {
 %TypeHeaderCode
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 %End
 
 
@@ -127,7 +127,7 @@ public:
 class KKeySequence
 {
 %TypeHeaderCode
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 %End
 
 
@@ -185,7 +185,7 @@ public:
 class TDEShortcut
 {
 %TypeHeaderCode
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 %End
 
 
diff --git a/sip/tdecore/tdeshortcutlist.sip b/sip/tdecore/tdeshortcutlist.sip
index b1fb9bd..a87a122 100644
--- a/sip/tdecore/tdeshortcutlist.sip
+++ b/sip/tdecore/tdeshortcutlist.sip
@@ -28,8 +28,8 @@ class TDEShortcutList
 {
 %TypeHeaderCode
 #include <tdeconfigbase.h>
-#include <kshortcut.h>
-#include <kshortcutlist.h>
+#include <tdeshortcut.h>
+#include <tdeshortcutlist.h>
 %End
 
 
@@ -69,8 +69,8 @@ class TDEAccelShortcutList : TDEShortcutList
 {
 %TypeHeaderCode
 #include <tdeconfigbase.h>
-#include <kshortcut.h>
-#include <kshortcutlist.h>
+#include <tdeshortcut.h>
+#include <tdeshortcutlist.h>
 %End
 
 
@@ -105,8 +105,8 @@ class ShortcutList : TDEShortcutList
 {
 %TypeHeaderCode
 #include <tdeconfigbase.h>
-#include <kshortcut.h>
-#include <kshortcutlist.h>
+#include <tdeshortcut.h>
+#include <tdeshortcutlist.h>
 %End
 
 
diff --git a/sip/tdecore/tdestdaccel.sip b/sip/tdecore/tdestdaccel.sip
index 2af5526..05ccb2c 100644
--- a/sip/tdecore/tdestdaccel.sip
+++ b/sip/tdecore/tdestdaccel.sip
@@ -24,7 +24,7 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 %ModuleHeaderCode
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 %End
 
 namespace TDEStdAccel
diff --git a/sip/tdefile/tdefile-kde352.diff b/sip/tdefile/tdefile-kde352.diff
index 9083bb6..46a59e2 100644
--- a/sip/tdefile/tdefile-kde352.diff
+++ b/sip/tdefile/tdefile-kde352.diff
@@ -1,4 +1,4 @@
-- %Include krecentdirs.sip
+- %Include tderecentdirs.sip
 + %Include kcustommenueditor.sip
 + %Include kdiskfreesp.sip
 + %Include kencodingfiledialog.sip
diff --git a/sip/tdefile/tdefilemod.sip.in b/sip/tdefile/tdefilemod.sip.in
index 7246ceb..1d8bb5d 100644
--- a/sip/tdefile/tdefilemod.sip.in
+++ b/sip/tdefile/tdefilemod.sip.in
@@ -55,7 +55,7 @@
 %Include kopenwith.sip
 %Include kpreviewwidgetbase.sip
 %Include kpropertiesdialog.sip
-%Include krecentdocument.sip
+%Include tderecentdocument.sip
 %Include kurlbar.sip
 %Include kurlcombobox.sip
 %Include kurlrequester.sip
diff --git a/sip/tdefile/tderecentdirs.sip b/sip/tdefile/tderecentdirs.sip
index 3022abd..a4b7d43 100644
--- a/sip/tdefile/tderecentdirs.sip
+++ b/sip/tdefile/tderecentdirs.sip
@@ -27,7 +27,7 @@
 class TDERecentDirs
 {
 %TypeHeaderCode
-#include <krecentdirs.h>
+#include <tderecentdirs.h>
 %End
 
 
diff --git a/sip/tdefile/tderecentdocument.sip b/sip/tdefile/tderecentdocument.sip
index b8d1169..cff6825 100644
--- a/sip/tdefile/tderecentdocument.sip
+++ b/sip/tdefile/tderecentdocument.sip
@@ -27,7 +27,7 @@
 class TDERecentDocument
 {
 %TypeHeaderCode
-#include <krecentdocument.h>
+#include <tderecentdocument.h>
 %End
 
 
diff --git a/sip/tdeparts/doctdemainwindow.sip b/sip/tdeparts/dockmainwindow.sip
index 1d05909..1d05909 100644
--- a/sip/tdeparts/doctdemainwindow.sip
+++ b/sip/tdeparts/dockmainwindow.sip
diff --git a/sip/tdeui/kxmlguifactory.sip b/sip/tdeui/kxmlguifactory.sip
index af2cd5b..e62e82c 100644
--- a/sip/tdeui/kxmlguifactory.sip
+++ b/sip/tdeui/kxmlguifactory.sip
@@ -88,7 +88,7 @@ TQPtrList<TDEAction>    testTDEActionList (TQPtrList<TDEAction>);
 {
 %TypeHeaderCode
 #include <tqptrlist.h>
-#include <kaction.h>
+#include <tdeaction.h>
 %End
 
 %ConvertFromTypeCode
diff --git a/sip/tdeui/tdeaccelmanager.sip b/sip/tdeui/tdeaccelmanager.sip
index 183f3d9..775226c 100644
--- a/sip/tdeui/tdeaccelmanager.sip
+++ b/sip/tdeui/tdeaccelmanager.sip
@@ -29,7 +29,7 @@
 class TDEAcceleratorManager
 {
 %TypeHeaderCode
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
 %End
 
 
diff --git a/sip/tdeui/tdeaccelmenu.sip b/sip/tdeui/tdeaccelmenu.sip
index 6477619..ccacf51 100644
--- a/sip/tdeui/tdeaccelmenu.sip
+++ b/sip/tdeui/tdeaccelmenu.sip
@@ -27,9 +27,9 @@
 class TDEAccelMenu : TDEPopupMenu
 {
 %TypeHeaderCode
-#include <kaccel.h>
-#include <kpopupmenu.h>
-#include <kaccelmenu.h>
+#include <tdeaccel.h>
+#include <tdepopupmenu.h>
+#include <tdeaccelmenu.h>
 %End
 
 
diff --git a/sip/tdeui/tdeaction.sip b/sip/tdeui/tdeaction.sip
index ff1d452..f0596bf 100644
--- a/sip/tdeui/tdeaction.sip
+++ b/sip/tdeui/tdeaction.sip
@@ -27,7 +27,7 @@
 class TDEAction : TQObject
 {
 %TypeHeaderCode
-#include <kaction.h>
+#include <tdeaction.h>
 %End
 
 
@@ -61,7 +61,7 @@ public:
     int                  containerCount () const;
 
 %If ( KDE_3_1_0 -  )
-    uint                 kaccelCount () const;
+    uint                 tdeaccelCount () const;
 %End
 
     virtual bool         hasIcon () const;
@@ -186,7 +186,7 @@ protected:
 class TDEToggleAction : TDEAction
 {
 %TypeHeaderCode
-#include <kaction.h>
+#include <tdeaction.h>
 %End
 
 
@@ -228,7 +228,7 @@ protected:
 class TDERadioAction : TDEToggleAction
 {
 %TypeHeaderCode
-#include <kaction.h>
+#include <tdeaction.h>
 %End
 
 
@@ -257,7 +257,7 @@ protected:
 class TDESelectAction : TDEAction
 {
 %TypeHeaderCode
-#include <kaction.h>
+#include <tdeaction.h>
 %End
 
 
@@ -329,7 +329,7 @@ protected:
 class TDEListAction : TDESelectAction
 {
 %TypeHeaderCode
-#include <kaction.h>
+#include <tdeaction.h>
 %End
 
 
@@ -360,7 +360,7 @@ protected:
 class TDERecentFilesAction : TDEListAction
 {
 %TypeHeaderCode
-#include <kaction.h>
+#include <tdeaction.h>
 %End
 
 
@@ -403,7 +403,7 @@ protected:
 class TDEFontAction : TDESelectAction
 {
 %TypeHeaderCode
-#include <kaction.h>
+#include <tdeaction.h>
 %End
 
 
@@ -434,7 +434,7 @@ protected:
 class TDEFontSizeAction : TDESelectAction
 {
 %TypeHeaderCode
-#include <kaction.h>
+#include <tdeaction.h>
 %End
 
 
@@ -472,7 +472,7 @@ protected:
 class TDEActionMenu : TDEAction
 {
 %TypeHeaderCode
-#include <kaction.h>
+#include <tdeaction.h>
 %End
 
 
@@ -504,7 +504,7 @@ protected:
 class TDEToolBarPopupAction : TDEAction
 {
 %TypeHeaderCode
-#include <kaction.h>
+#include <tdeaction.h>
 %End
 
 
@@ -532,7 +532,7 @@ protected:
 class TDEToggleToolBarAction : TDEToggleAction
 {
 %TypeHeaderCode
-#include <kaction.h>
+#include <tdeaction.h>
 %End
 
 
@@ -558,7 +558,7 @@ protected:
 class KWidgetAction : TDEAction
 {
 %TypeHeaderCode
-#include <kaction.h>
+#include <tdeaction.h>
 %End
 
 
@@ -585,7 +585,7 @@ protected:
 class TDEActionSeparator : TDEAction
 {
 %TypeHeaderCode
-#include <kaction.h>
+#include <tdeaction.h>
 %End
 
 
@@ -606,7 +606,7 @@ protected:
 class TDEActionCollection : TQObject
 {
 %TypeHeaderCode
-#include <kaction.h>
+#include <tdeaction.h>
 %End
 
 
@@ -625,7 +625,7 @@ public:
     virtual TDEAccel*      accel ();
 
 %If ( KDE_3_1_0 -  )
-    TDEAccel*              kaccel ();
+    TDEAccel*              tdeaccel ();
     TDEAccel*              builderTDEAccel () const;
 %End
 
@@ -692,7 +692,7 @@ protected:
 {
 %TypeHeaderCode
 #include <tqvaluelist.h>
-#include <kaction.h>
+#include <tdeaction.h>
 //typedef TQValueList<TDEAction*> TDEActionPtrList;
 %End
 
diff --git a/sip/tdeui/tdeactionclasses.sip b/sip/tdeui/tdeactionclasses.sip
index 63cc6d6..f566ecd 100644
--- a/sip/tdeui/tdeactionclasses.sip
+++ b/sip/tdeui/tdeactionclasses.sip
@@ -29,7 +29,7 @@
 class TDEToggleAction : TDEAction
 {
 %TypeHeaderCode
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 %End
 
 
@@ -77,7 +77,7 @@ protected:
 class TDERadioAction : TDEToggleAction
 {
 %TypeHeaderCode
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 %End
 
 
@@ -106,7 +106,7 @@ protected:
 class TDESelectAction : TDEAction
 {
 %TypeHeaderCode
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 %End
 
 
@@ -180,7 +180,7 @@ protected:
 class TDEListAction : TDESelectAction
 {
 %TypeHeaderCode
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 %End
 
 
@@ -211,7 +211,7 @@ protected:
 class TDERecentFilesAction : TDEListAction
 {
 %TypeHeaderCode
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 %End
 
 
@@ -270,7 +270,7 @@ protected:
 class TDEFontAction : TDESelectAction
 {
 %TypeHeaderCode
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 %End
 
 
@@ -307,7 +307,7 @@ protected:
 class TDEFontSizeAction : TDESelectAction
 {
 %TypeHeaderCode
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 %End
 
 
@@ -345,7 +345,7 @@ protected:
 class TDEActionMenu : TDEAction
 {
 %TypeHeaderCode
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 %End
 
 
@@ -377,7 +377,7 @@ protected:
 class TDEToolBarPopupAction : TDEAction
 {
 %TypeHeaderCode
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 %End
 
 
@@ -405,7 +405,7 @@ protected:
 class TDEToggleToolBarAction : TDEToggleAction
 {
 %TypeHeaderCode
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 %End
 
 
@@ -431,7 +431,7 @@ protected:
 class TDEToggleFullScreenAction : TDEToggleAction
 {
 %TypeHeaderCode
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 %End
 
 
@@ -458,7 +458,7 @@ protected:
 class KWidgetAction : TDEAction
 {
 %TypeHeaderCode
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 %End
 
 
@@ -485,7 +485,7 @@ protected:
 class TDEActionSeparator : TDEAction
 {
 %TypeHeaderCode
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 %End
 
 
@@ -506,7 +506,7 @@ protected:
 class TDEPasteTextAction : TDEAction
 {
 %TypeHeaderCode
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 %End
 
 
diff --git a/sip/tdeui/tdeactioncollection.sip b/sip/tdeui/tdeactioncollection.sip
index c696bdd..2ba234b 100644
--- a/sip/tdeui/tdeactioncollection.sip
+++ b/sip/tdeui/tdeactioncollection.sip
@@ -29,7 +29,7 @@
 class TDEActionCollection : TQObject
 {
 %TypeHeaderCode
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
 %End
 
 
@@ -42,7 +42,7 @@ public:
     bool                 isAutoConnectShortcuts ();
     bool                 addDocCollection (TDEActionCollection*);
     virtual TDEAccel*      accel ();
-    TDEAccel*              kaccel ();
+    TDEAccel*              tdeaccel ();
     TDEAccel*              builderTDEAccel () const;
     virtual uint         count () const;
     bool                 isEmpty () const;
diff --git a/sip/tdeui/tdeactionselector.sip b/sip/tdeui/tdeactionselector.sip
index 717c2d3..4903126 100644
--- a/sip/tdeui/tdeactionselector.sip
+++ b/sip/tdeui/tdeactionselector.sip
@@ -29,7 +29,7 @@
 class TDEActionSelector : TQWidget
 {
 %TypeHeaderCode
-#include <kactionselector.h>
+#include <tdeactionselector.h>
 %End
 
 
diff --git a/sip/tdeui/tdeactionshortcutlist.sip b/sip/tdeui/tdeactionshortcutlist.sip
index bd45aea..9ef6444 100644
--- a/sip/tdeui/tdeactionshortcutlist.sip
+++ b/sip/tdeui/tdeactionshortcutlist.sip
@@ -28,9 +28,9 @@ class TDEActionShortcutList : TDEShortcutList
 {
 %TypeHeaderCode
 #include <tdeconfigbase.h>
-#include <kshortcut.h>
-#include <kaction.h>
-#include <kactionshortcutlist.h>
+#include <tdeshortcut.h>
+#include <tdeaction.h>
+#include <tdeactionshortcutlist.h>
 %End
 
 
@@ -66,9 +66,9 @@ class TDEActionPtrShortcutList : TDEShortcutList
 {
 %TypeHeaderCode
 #include <tdeconfigbase.h>
-#include <kshortcut.h>
-#include <kaction.h>
-#include <kactionshortcutlist.h>
+#include <tdeshortcut.h>
+#include <tdeaction.h>
+#include <tdeactionshortcutlist.h>
 %End
 
 
diff --git a/sip/tdeui/tdefontcombo.sip b/sip/tdeui/tdefontcombo.sip
index 96d2865..a3e7596 100644
--- a/sip/tdeui/tdefontcombo.sip
+++ b/sip/tdeui/tdefontcombo.sip
@@ -27,7 +27,7 @@
 class TDEFontCombo : KComboBox
 {
 %TypeHeaderCode
-#include <kfontcombo.h>
+#include <tdefontcombo.h>
 %End
 
 
diff --git a/sip/tdeui/tdefontdialog.sip b/sip/tdeui/tdefontdialog.sip
index 3fc4cb2..9d442d7 100644
--- a/sip/tdeui/tdefontdialog.sip
+++ b/sip/tdeui/tdefontdialog.sip
@@ -28,7 +28,7 @@ class TDEFontChooser : TQWidget
 {
 %TypeHeaderCode
 #include <tqbutton.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
 %End
 
 
@@ -118,7 +118,7 @@ public:
 class TDEFontDialog : KDialogBase
 {
 %TypeHeaderCode
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
 %End
 
 
diff --git a/sip/tdeui/tdefontrequester.sip b/sip/tdeui/tdefontrequester.sip
index 9d84461..4537998 100644
--- a/sip/tdeui/tdefontrequester.sip
+++ b/sip/tdeui/tdefontrequester.sip
@@ -29,7 +29,7 @@
 class TDEFontRequester : TQWidget
 {
 %TypeHeaderCode
-#include <kfontrequester.h>
+#include <tdefontrequester.h>
 %End
 
 
diff --git a/sip/tdeui/tdelistbox.sip b/sip/tdeui/tdelistbox.sip
index 9c2c1c1..97d25e6 100644
--- a/sip/tdeui/tdelistbox.sip
+++ b/sip/tdeui/tdelistbox.sip
@@ -27,7 +27,7 @@
 class TDEListBox : TQListBox
 {
 %TypeHeaderCode
-#include <klistbox.h>
+#include <tdelistbox.h>
 %End
 
 
diff --git a/sip/tdeui/tdelistview.sip b/sip/tdeui/tdelistview.sip
index 2af44b2..1a59997 100644
--- a/sip/tdeui/tdelistview.sip
+++ b/sip/tdeui/tdelistview.sip
@@ -27,7 +27,7 @@
 class TDEListView : TQListView
 {
 %TypeHeaderCode
-#include <klistview.h>
+#include <tdelistview.h>
 %End
 
 
@@ -230,7 +230,7 @@ protected:
 class TDEListViewItem : TQListViewItem
 {
 %TypeHeaderCode
-#include <klistview.h>
+#include <tdelistview.h>
 %End
 
 
diff --git a/sip/tdeui/tdelistviewlineedit.sip b/sip/tdeui/tdelistviewlineedit.sip
index c5125f0..ef57558 100644
--- a/sip/tdeui/tdelistviewlineedit.sip
+++ b/sip/tdeui/tdelistviewlineedit.sip
@@ -27,7 +27,7 @@
 class TDEListViewLineEdit : KLineEdit
 {
 %TypeHeaderCode
-#include <klistviewlineedit.h>
+#include <tdelistviewlineedit.h>
 %End
 
 
diff --git a/sip/tdeui/tdelistviewsearchline.sip b/sip/tdeui/tdelistviewsearchline.sip
index 4c73477..495f26f 100644
--- a/sip/tdeui/tdelistviewsearchline.sip
+++ b/sip/tdeui/tdelistviewsearchline.sip
@@ -29,7 +29,7 @@
 class TDEListViewSearchLine : KLineEdit
 {
 %TypeHeaderCode
-#include <klistviewsearchline.h>
+#include <tdelistviewsearchline.h>
 %End
 
 
@@ -66,7 +66,7 @@ protected slots:
 class TDEListViewSearchLineWidget : TQHBox
 {
 %TypeHeaderCode
-#include <klistviewsearchline.h>
+#include <tdelistviewsearchline.h>
 %End
 
 
diff --git a/sip/tdeui/tdemainwindow.sip b/sip/tdeui/tdemainwindow.sip
index b056361..ea9635a 100644
--- a/sip/tdeui/tdemainwindow.sip
+++ b/sip/tdeui/tdemainwindow.sip
@@ -27,7 +27,7 @@
 class TDEMainWindow : TQMainWindow, KXMLGUIBuilder, KXMLGUIClient
 {
 %TypeHeaderCode
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 %End
 
 
@@ -205,7 +205,7 @@ protected:
 {
 %TypeHeaderCode
 #include <tqptrlist.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 %End
 
 %ConvertFromTypeCode
diff --git a/sip/tdeui/tdemainwindowiface.sip b/sip/tdeui/tdemainwindowiface.sip
index d872a0a..5f6d8b4 100644
--- a/sip/tdeui/tdemainwindowiface.sip
+++ b/sip/tdeui/tdemainwindowiface.sip
@@ -27,7 +27,7 @@
 class TDEMainWindowInterface : DCOPObject
 {
 %TypeHeaderCode
-#include <kmainwindowiface.h>
+#include <tdemainwindowiface.h>
 %End
 
 
diff --git a/sip/tdeui/tdepopupmenu.sip b/sip/tdeui/tdepopupmenu.sip
index a4b523a..c7fc8f8 100644
--- a/sip/tdeui/tdepopupmenu.sip
+++ b/sip/tdeui/tdepopupmenu.sip
@@ -27,7 +27,7 @@
 class TDEPopupTitle : TQWidget
 {
 %TypeHeaderCode
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 %End
 
 
@@ -65,7 +65,7 @@ protected:
 class TDEPopupMenu : TQPopupMenu
 {
 %TypeHeaderCode
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 %End
 
 
diff --git a/sip/tdeui/tdeselect.sip b/sip/tdeui/tdeselect.sip
index 7c88d8c..422575d 100644
--- a/sip/tdeui/tdeselect.sip
+++ b/sip/tdeui/tdeselect.sip
@@ -27,7 +27,7 @@
 class KXYSelector : TQWidget
 {
 %TypeHeaderCode
-#include <kselect.h>
+#include <tdeselect.h>
 %End
 
 
@@ -70,7 +70,7 @@ protected:
 class TDESelector : TQWidget, TQRangeControl
 {
 %TypeHeaderCode
-#include <kselect.h>
+#include <tdeselect.h>
 %End
 
 
@@ -113,7 +113,7 @@ protected:
 class KGradientSelector : TDESelector
 {
 %TypeHeaderCode
-#include <kselect.h>
+#include <tdeselect.h>
 %End
 
 
diff --git a/sip/tdeui/tdeshortcutdialog.sip b/sip/tdeui/tdeshortcutdialog.sip
index eb0d9c8..4a17ece 100644
--- a/sip/tdeui/tdeshortcutdialog.sip
+++ b/sip/tdeui/tdeshortcutdialog.sip
@@ -29,7 +29,7 @@
 class TDEShortcutDialog : KDialogBase
 {
 %TypeHeaderCode
-#include <kshortcutdialog.h>
+#include <tdeshortcutdialog.h>
 %End
 
 
diff --git a/sip/tdeui/tdetoolbar.sip b/sip/tdeui/tdetoolbar.sip
index 5317080..3f8878f 100644
--- a/sip/tdeui/tdetoolbar.sip
+++ b/sip/tdeui/tdetoolbar.sip
@@ -27,7 +27,7 @@
 class TDEToolBarSeparator : TQFrame
 {
 %TypeHeaderCode
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 %End
 
 
@@ -55,7 +55,7 @@ protected:
 class TDEToolBar : TQToolBar
 {
 %TypeHeaderCode
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 %End
 
 
diff --git a/sip/tdeui/tdetoolbarbutton.sip b/sip/tdeui/tdetoolbarbutton.sip
index cb78fa7..ca8460c 100644
--- a/sip/tdeui/tdetoolbarbutton.sip
+++ b/sip/tdeui/tdetoolbarbutton.sip
@@ -27,7 +27,7 @@
 class TDEToolBarButton : TQToolButton
 {
 %TypeHeaderCode
-#include <ktoolbarbutton.h>
+#include <tdetoolbarbutton.h>
 %End
 
 
diff --git a/sip/tdeui/tdetoolbarlabelaction.sip b/sip/tdeui/tdetoolbarlabelaction.sip
index d3f06e8..e457c11 100644
--- a/sip/tdeui/tdetoolbarlabelaction.sip
+++ b/sip/tdeui/tdetoolbarlabelaction.sip
@@ -29,7 +29,7 @@
 class TDEToolBarLabelAction : KWidgetAction
 {
 %TypeHeaderCode
-#include <ktoolbarlabelaction.h>
+#include <tdetoolbarlabelaction.h>
 %End
 
 
diff --git a/sip/tdeui/tdetoolbarradiogroup.sip b/sip/tdeui/tdetoolbarradiogroup.sip
index e6240e1..3dedf72 100644
--- a/sip/tdeui/tdetoolbarradiogroup.sip
+++ b/sip/tdeui/tdetoolbarradiogroup.sip
@@ -27,7 +27,7 @@
 class TDEToolBarRadioGroup : TQObject
 {
 %TypeHeaderCode
-#include <ktoolbarradiogroup.h>
+#include <tdetoolbarradiogroup.h>
 %End
 
 
diff --git a/sip/tdeui/tdeui-kde310.diff b/sip/tdeui/tdeui-kde310.diff
index c12c183..c0e5386 100644
--- a/sip/tdeui/tdeui-kde310.diff
+++ b/sip/tdeui/tdeui-kde310.diff
@@ -1,4 +1,4 @@
-+ %Include kaccelmanager.sip
++ %Include tdeaccelmanager.sip
 + %Include kpassivepopup.sip
 + %Include ktextedit.sip
 + %Include twindowinfo.sip
diff --git a/sip/tdeui/tdeui-kde311.diff b/sip/tdeui/tdeui-kde311.diff
index c12c183..c0e5386 100644
--- a/sip/tdeui/tdeui-kde311.diff
+++ b/sip/tdeui/tdeui-kde311.diff
@@ -1,4 +1,4 @@
-+ %Include kaccelmanager.sip
++ %Include tdeaccelmanager.sip
 + %Include kpassivepopup.sip
 + %Include ktextedit.sip
 + %Include twindowinfo.sip
diff --git a/sip/tdeui/tdeui-kde312.diff b/sip/tdeui/tdeui-kde312.diff
index c12c183..c0e5386 100644
--- a/sip/tdeui/tdeui-kde312.diff
+++ b/sip/tdeui/tdeui-kde312.diff
@@ -1,4 +1,4 @@
-+ %Include kaccelmanager.sip
++ %Include tdeaccelmanager.sip
 + %Include kpassivepopup.sip
 + %Include ktextedit.sip
 + %Include twindowinfo.sip
diff --git a/sip/tdeui/tdeui-kde313.diff b/sip/tdeui/tdeui-kde313.diff
index c12c183..c0e5386 100644
--- a/sip/tdeui/tdeui-kde313.diff
+++ b/sip/tdeui/tdeui-kde313.diff
@@ -1,4 +1,4 @@
-+ %Include kaccelmanager.sip
++ %Include tdeaccelmanager.sip
 + %Include kpassivepopup.sip
 + %Include ktextedit.sip
 + %Include twindowinfo.sip
diff --git a/sip/tdeui/tdeui-kde314.diff b/sip/tdeui/tdeui-kde314.diff
index c12c183..c0e5386 100644
--- a/sip/tdeui/tdeui-kde314.diff
+++ b/sip/tdeui/tdeui-kde314.diff
@@ -1,4 +1,4 @@
-+ %Include kaccelmanager.sip
++ %Include tdeaccelmanager.sip
 + %Include kpassivepopup.sip
 + %Include ktextedit.sip
 + %Include twindowinfo.sip
diff --git a/sip/tdeui/tdeui-kde315.diff b/sip/tdeui/tdeui-kde315.diff
index c12c183..c0e5386 100644
--- a/sip/tdeui/tdeui-kde315.diff
+++ b/sip/tdeui/tdeui-kde315.diff
@@ -1,4 +1,4 @@
-+ %Include kaccelmanager.sip
++ %Include tdeaccelmanager.sip
 + %Include kpassivepopup.sip
 + %Include ktextedit.sip
 + %Include twindowinfo.sip
diff --git a/sip/tdeui/tdeui-kde320.diff b/sip/tdeui/tdeui-kde320.diff
index f1c0755..2054327 100644
--- a/sip/tdeui/tdeui-kde320.diff
+++ b/sip/tdeui/tdeui-kde320.diff
@@ -1,8 +1,8 @@
-+ %Include kactionclasses.sip
-+ %Include kactioncollection.sip
++ %Include tdeactionclasses.sip
++ %Include tdeactioncollection.sip
 + %Include tdeconfigdialog.sip
 + %Include kdatetimewidget.sip
-+ %Include kfontrequester.sip
++ %Include tdefontrequester.sip
 + %Include kinputdialog.sip
 + %Include kpassivepopup.sip
 + %Include ksplashscreen.sip
diff --git a/sip/tdeui/tdeui-kde321.diff b/sip/tdeui/tdeui-kde321.diff
index f1c0755..2054327 100644
--- a/sip/tdeui/tdeui-kde321.diff
+++ b/sip/tdeui/tdeui-kde321.diff
@@ -1,8 +1,8 @@
-+ %Include kactionclasses.sip
-+ %Include kactioncollection.sip
++ %Include tdeactionclasses.sip
++ %Include tdeactioncollection.sip
 + %Include tdeconfigdialog.sip
 + %Include kdatetimewidget.sip
-+ %Include kfontrequester.sip
++ %Include tdefontrequester.sip
 + %Include kinputdialog.sip
 + %Include kpassivepopup.sip
 + %Include ksplashscreen.sip
diff --git a/sip/tdeui/tdeui-kde322.diff b/sip/tdeui/tdeui-kde322.diff
index f1c0755..2054327 100644
--- a/sip/tdeui/tdeui-kde322.diff
+++ b/sip/tdeui/tdeui-kde322.diff
@@ -1,8 +1,8 @@
-+ %Include kactionclasses.sip
-+ %Include kactioncollection.sip
++ %Include tdeactionclasses.sip
++ %Include tdeactioncollection.sip
 + %Include tdeconfigdialog.sip
 + %Include kdatetimewidget.sip
-+ %Include kfontrequester.sip
++ %Include tdefontrequester.sip
 + %Include kinputdialog.sip
 + %Include kpassivepopup.sip
 + %Include ksplashscreen.sip
diff --git a/sip/tdeui/tdeui-kde323.diff b/sip/tdeui/tdeui-kde323.diff
index 18841bb..c95dd6c 100644
--- a/sip/tdeui/tdeui-kde323.diff
+++ b/sip/tdeui/tdeui-kde323.diff
@@ -1,8 +1,8 @@
-+ %Include kactionclasses.sip
-+ %Include kactioncollection.sip
++ %Include tdeactionclasses.sip
++ %Include tdeactioncollection.sip
 + %Include tdeconfigdialog.sip
 + %Include kdatetimewidget.sip
-+ %Include kfontrequester.sip
++ %Include tdefontrequester.sip
 + %Include kinputdialog.sip
 + %Include kpassivepopup.sip
 //+ %Include ksharedpixmap.sip
diff --git a/sip/tdeui/tdeui-kde330.diff b/sip/tdeui/tdeui-kde330.diff
index 0e78196..7c97cf8 100644
--- a/sip/tdeui/tdeui-kde330.diff
+++ b/sip/tdeui/tdeui-kde330.diff
@@ -1,12 +1,12 @@
-+ %Include kactionclasses.sip
-+ %Include kactioncollection.sip
-+ %Include kactionselector.sip
++ %Include tdeactionclasses.sip
++ %Include tdeactioncollection.sip
++ %Include tdeactionselector.sip
 + %Include tdeconfigdialog.sip
 + %Include kdatetimewidget.sip
-+ %Include kfontrequester.sip
++ %Include tdefontrequester.sip
 + %Include kinputdialog.sip
 + %Include klanguagebutton.sip
-+ %Include klistviewsearchline.sip
++ %Include tdelistviewsearchline.sip
 + %Include kpassivepopup.sip
 + %Include ksplashscreen.sip
 + %Include ktabbar.sip
diff --git a/sip/tdeui/tdeui-kde331.diff b/sip/tdeui/tdeui-kde331.diff
index 0e78196..7c97cf8 100644
--- a/sip/tdeui/tdeui-kde331.diff
+++ b/sip/tdeui/tdeui-kde331.diff
@@ -1,12 +1,12 @@
-+ %Include kactionclasses.sip
-+ %Include kactioncollection.sip
-+ %Include kactionselector.sip
++ %Include tdeactionclasses.sip
++ %Include tdeactioncollection.sip
++ %Include tdeactionselector.sip
 + %Include tdeconfigdialog.sip
 + %Include kdatetimewidget.sip
-+ %Include kfontrequester.sip
++ %Include tdefontrequester.sip
 + %Include kinputdialog.sip
 + %Include klanguagebutton.sip
-+ %Include klistviewsearchline.sip
++ %Include tdelistviewsearchline.sip
 + %Include kpassivepopup.sip
 + %Include ksplashscreen.sip
 + %Include ktabbar.sip
diff --git a/sip/tdeui/tdeui-kde332.diff b/sip/tdeui/tdeui-kde332.diff
index 0e78196..7c97cf8 100644
--- a/sip/tdeui/tdeui-kde332.diff
+++ b/sip/tdeui/tdeui-kde332.diff
@@ -1,12 +1,12 @@
-+ %Include kactionclasses.sip
-+ %Include kactioncollection.sip
-+ %Include kactionselector.sip
++ %Include tdeactionclasses.sip
++ %Include tdeactioncollection.sip
++ %Include tdeactionselector.sip
 + %Include tdeconfigdialog.sip
 + %Include kdatetimewidget.sip
-+ %Include kfontrequester.sip
++ %Include tdefontrequester.sip
 + %Include kinputdialog.sip
 + %Include klanguagebutton.sip
-+ %Include klistviewsearchline.sip
++ %Include tdelistviewsearchline.sip
 + %Include kpassivepopup.sip
 + %Include ksplashscreen.sip
 + %Include ktabbar.sip
diff --git a/sip/tdeui/tdeui-kde340.diff b/sip/tdeui/tdeui-kde340.diff
index a59386a..1b1377a 100644
--- a/sip/tdeui/tdeui-kde340.diff
+++ b/sip/tdeui/tdeui-kde340.diff
@@ -1,21 +1,21 @@
-+ %Include kactionclasses.sip
-+ %Include kactioncollection.sip
-+ %Include kactionselector.sip
++ %Include tdeactionclasses.sip
++ %Include tdeactioncollection.sip
++ %Include tdeactionselector.sip
 + %Include tdeconfigdialog.sip
 + %Include kdatetimewidget.sip
-+ %Include kfontrequester.sip
++ %Include tdefontrequester.sip
 + %Include kiconviewsearchline.sip
 + %Include kinputdialog.sip
 + %Include klanguagebutton.sip
-+ %Include klistviewsearchline.sip
++ %Include tdelistviewsearchline.sip
 + %Include kpassivepopup.sip
 + %Include kpixmapregionselectordialog.sip
 + %Include kpixmapregionselectorwidget.sip
-+ %Include kshortcutdialog.sip
++ %Include tdeshortcutdialog.sip
 + %Include ksplashscreen.sip
 + %Include ktabbar.sip
 + %Include ktabwidget.sip
 + %Include ktextedit.sip
 + %Include ktimewidget.sip
-+ %Include ktoolbarlabelaction.sip
++ %Include tdetoolbarlabelaction.sip
 + %Include twindowinfo.sip
diff --git a/sip/tdeui/tdeui-kde341.diff b/sip/tdeui/tdeui-kde341.diff
index a59386a..1b1377a 100644
--- a/sip/tdeui/tdeui-kde341.diff
+++ b/sip/tdeui/tdeui-kde341.diff
@@ -1,21 +1,21 @@
-+ %Include kactionclasses.sip
-+ %Include kactioncollection.sip
-+ %Include kactionselector.sip
++ %Include tdeactionclasses.sip
++ %Include tdeactioncollection.sip
++ %Include tdeactionselector.sip
 + %Include tdeconfigdialog.sip
 + %Include kdatetimewidget.sip
-+ %Include kfontrequester.sip
++ %Include tdefontrequester.sip
 + %Include kiconviewsearchline.sip
 + %Include kinputdialog.sip
 + %Include klanguagebutton.sip
-+ %Include klistviewsearchline.sip
++ %Include tdelistviewsearchline.sip
 + %Include kpassivepopup.sip
 + %Include kpixmapregionselectordialog.sip
 + %Include kpixmapregionselectorwidget.sip
-+ %Include kshortcutdialog.sip
++ %Include tdeshortcutdialog.sip
 + %Include ksplashscreen.sip
 + %Include ktabbar.sip
 + %Include ktabwidget.sip
 + %Include ktextedit.sip
 + %Include ktimewidget.sip
-+ %Include ktoolbarlabelaction.sip
++ %Include tdetoolbarlabelaction.sip
 + %Include twindowinfo.sip
diff --git a/sip/tdeui/tdeui-kde342.diff b/sip/tdeui/tdeui-kde342.diff
index a59386a..1b1377a 100644
--- a/sip/tdeui/tdeui-kde342.diff
+++ b/sip/tdeui/tdeui-kde342.diff
@@ -1,21 +1,21 @@
-+ %Include kactionclasses.sip
-+ %Include kactioncollection.sip
-+ %Include kactionselector.sip
++ %Include tdeactionclasses.sip
++ %Include tdeactioncollection.sip
++ %Include tdeactionselector.sip
 + %Include tdeconfigdialog.sip
 + %Include kdatetimewidget.sip
-+ %Include kfontrequester.sip
++ %Include tdefontrequester.sip
 + %Include kiconviewsearchline.sip
 + %Include kinputdialog.sip
 + %Include klanguagebutton.sip
-+ %Include klistviewsearchline.sip
++ %Include tdelistviewsearchline.sip
 + %Include kpassivepopup.sip
 + %Include kpixmapregionselectordialog.sip
 + %Include kpixmapregionselectorwidget.sip
-+ %Include kshortcutdialog.sip
++ %Include tdeshortcutdialog.sip
 + %Include ksplashscreen.sip
 + %Include ktabbar.sip
 + %Include ktabwidget.sip
 + %Include ktextedit.sip
 + %Include ktimewidget.sip
-+ %Include ktoolbarlabelaction.sip
++ %Include tdetoolbarlabelaction.sip
 + %Include twindowinfo.sip
diff --git a/sip/tdeui/tdeui-kde343.diff b/sip/tdeui/tdeui-kde343.diff
index a59386a..1b1377a 100644
--- a/sip/tdeui/tdeui-kde343.diff
+++ b/sip/tdeui/tdeui-kde343.diff
@@ -1,21 +1,21 @@
-+ %Include kactionclasses.sip
-+ %Include kactioncollection.sip
-+ %Include kactionselector.sip
++ %Include tdeactionclasses.sip
++ %Include tdeactioncollection.sip
++ %Include tdeactionselector.sip
 + %Include tdeconfigdialog.sip
 + %Include kdatetimewidget.sip
-+ %Include kfontrequester.sip
++ %Include tdefontrequester.sip
 + %Include kiconviewsearchline.sip
 + %Include kinputdialog.sip
 + %Include klanguagebutton.sip
-+ %Include klistviewsearchline.sip
++ %Include tdelistviewsearchline.sip
 + %Include kpassivepopup.sip
 + %Include kpixmapregionselectordialog.sip
 + %Include kpixmapregionselectorwidget.sip
-+ %Include kshortcutdialog.sip
++ %Include tdeshortcutdialog.sip
 + %Include ksplashscreen.sip
 + %Include ktabbar.sip
 + %Include ktabwidget.sip
 + %Include ktextedit.sip
 + %Include ktimewidget.sip
-+ %Include ktoolbarlabelaction.sip
++ %Include tdetoolbarlabelaction.sip
 + %Include twindowinfo.sip
diff --git a/sip/tdeui/tdeui-kde350.diff b/sip/tdeui/tdeui-kde350.diff
index b78a05a..8784d8d 100644
--- a/sip/tdeui/tdeui-kde350.diff
+++ b/sip/tdeui/tdeui-kde350.diff
@@ -1,23 +1,23 @@
-+ %Include kactionclasses.sip
-+ %Include kactioncollection.sip
-+ %Include kactionselector.sip
++ %Include tdeactionclasses.sip
++ %Include tdeactioncollection.sip
++ %Include tdeactionselector.sip
 + %Include tdeconfigdialog.sip
 + %Include kdatetimewidget.sip
-+ %Include kfontrequester.sip
++ %Include tdefontrequester.sip
 + %Include kiconviewsearchline.sip
 + %Include kinputdialog.sip
 + %Include klanguagebutton.sip
-+ %Include klistviewsearchline.sip
++ %Include tdelistviewsearchline.sip
 + %Include kpassivepopup.sip
 + %Include kpixmapregionselectordialog.sip
 + %Include kpixmapregionselectorwidget.sip
 + %Include kscrollview.sip
-+ %Include kshortcutdialog.sip
++ %Include tdeshortcutdialog.sip
 + %Include ksplashscreen.sip
 + %Include ktabbar.sip
 + %Include ktabwidget.sip
 + %Include ktextedit.sip
 + %Include ktimewidget.sip
 + %Include ktimezonewidget.sip
-+ %Include ktoolbarlabelaction.sip
++ %Include tdetoolbarlabelaction.sip
 + %Include twindowinfo.sip
diff --git a/sip/tdeui/tdeui-kde351.diff b/sip/tdeui/tdeui-kde351.diff
index b78a05a..8784d8d 100644
--- a/sip/tdeui/tdeui-kde351.diff
+++ b/sip/tdeui/tdeui-kde351.diff
@@ -1,23 +1,23 @@
-+ %Include kactionclasses.sip
-+ %Include kactioncollection.sip
-+ %Include kactionselector.sip
++ %Include tdeactionclasses.sip
++ %Include tdeactioncollection.sip
++ %Include tdeactionselector.sip
 + %Include tdeconfigdialog.sip
 + %Include kdatetimewidget.sip
-+ %Include kfontrequester.sip
++ %Include tdefontrequester.sip
 + %Include kiconviewsearchline.sip
 + %Include kinputdialog.sip
 + %Include klanguagebutton.sip
-+ %Include klistviewsearchline.sip
++ %Include tdelistviewsearchline.sip
 + %Include kpassivepopup.sip
 + %Include kpixmapregionselectordialog.sip
 + %Include kpixmapregionselectorwidget.sip
 + %Include kscrollview.sip
-+ %Include kshortcutdialog.sip
++ %Include tdeshortcutdialog.sip
 + %Include ksplashscreen.sip
 + %Include ktabbar.sip
 + %Include ktabwidget.sip
 + %Include ktextedit.sip
 + %Include ktimewidget.sip
 + %Include ktimezonewidget.sip
-+ %Include ktoolbarlabelaction.sip
++ %Include tdetoolbarlabelaction.sip
 + %Include twindowinfo.sip
diff --git a/sip/tdeui/tdeui-kde352.diff b/sip/tdeui/tdeui-kde352.diff
index b78a05a..8784d8d 100644
--- a/sip/tdeui/tdeui-kde352.diff
+++ b/sip/tdeui/tdeui-kde352.diff
@@ -1,23 +1,23 @@
-+ %Include kactionclasses.sip
-+ %Include kactioncollection.sip
-+ %Include kactionselector.sip
++ %Include tdeactionclasses.sip
++ %Include tdeactioncollection.sip
++ %Include tdeactionselector.sip
 + %Include tdeconfigdialog.sip
 + %Include kdatetimewidget.sip
-+ %Include kfontrequester.sip
++ %Include tdefontrequester.sip
 + %Include kiconviewsearchline.sip
 + %Include kinputdialog.sip
 + %Include klanguagebutton.sip
-+ %Include klistviewsearchline.sip
++ %Include tdelistviewsearchline.sip
 + %Include kpassivepopup.sip
 + %Include kpixmapregionselectordialog.sip
 + %Include kpixmapregionselectorwidget.sip
 + %Include kscrollview.sip
-+ %Include kshortcutdialog.sip
++ %Include tdeshortcutdialog.sip
 + %Include ksplashscreen.sip
 + %Include ktabbar.sip
 + %Include ktabwidget.sip
 + %Include ktextedit.sip
 + %Include ktimewidget.sip
 + %Include ktimezonewidget.sip
-+ %Include ktoolbarlabelaction.sip
++ %Include tdetoolbarlabelaction.sip
 + %Include twindowinfo.sip
diff --git a/sip/tdeui/tdeui-kde353.diff b/sip/tdeui/tdeui-kde353.diff
index b78a05a..8784d8d 100644
--- a/sip/tdeui/tdeui-kde353.diff
+++ b/sip/tdeui/tdeui-kde353.diff
@@ -1,23 +1,23 @@
-+ %Include kactionclasses.sip
-+ %Include kactioncollection.sip
-+ %Include kactionselector.sip
++ %Include tdeactionclasses.sip
++ %Include tdeactioncollection.sip
++ %Include tdeactionselector.sip
 + %Include tdeconfigdialog.sip
 + %Include kdatetimewidget.sip
-+ %Include kfontrequester.sip
++ %Include tdefontrequester.sip
 + %Include kiconviewsearchline.sip
 + %Include kinputdialog.sip
 + %Include klanguagebutton.sip
-+ %Include klistviewsearchline.sip
++ %Include tdelistviewsearchline.sip
 + %Include kpassivepopup.sip
 + %Include kpixmapregionselectordialog.sip
 + %Include kpixmapregionselectorwidget.sip
 + %Include kscrollview.sip
-+ %Include kshortcutdialog.sip
++ %Include tdeshortcutdialog.sip
 + %Include ksplashscreen.sip
 + %Include ktabbar.sip
 + %Include ktabwidget.sip
 + %Include ktextedit.sip
 + %Include ktimewidget.sip
 + %Include ktimezonewidget.sip
-+ %Include ktoolbarlabelaction.sip
++ %Include tdetoolbarlabelaction.sip
 + %Include twindowinfo.sip
diff --git a/sip/tdeui/tdeuimod.sip.in b/sip/tdeui/tdeuimod.sip.in
index c9101c8..8002a8c 100644
--- a/sip/tdeui/tdeuimod.sip.in
+++ b/sip/tdeui/tdeuimod.sip.in
@@ -37,8 +37,8 @@
 %Include kaboutapplication.sip
 %Include kaboutdialog.sip
 %Include kaboutkde.sip
-%Include kaction.sip
-%Include kactionshortcutlist.sip
+%Include tdeaction.sip
+%Include tdeactionshortcutlist.sip
 %Include kactivelabel.sip
 %Include kanimwidget.sip
 %Include karrowbutton.sip
@@ -67,8 +67,8 @@
 %Include keditcl.sip
 %Include keditlistbox.sip
 %Include kedittoolbar.sip
-%Include kfontcombo.sip
-%Include kfontdialog.sip
+%Include tdefontcombo.sip
+%Include tdefontdialog.sip
 %Include kguiitem.sip
 %Include khelpmenu.sip
 %Include kiconview.sip
@@ -78,10 +78,10 @@
 %Include kled.sip
 %Include klineedit.sip
 %Include klineeditdlg.sip
-%Include klistbox.sip
-%Include klistview.sip
-%Include kmainwindow.sip
-%Include kmainwindowiface.sip
+%Include tdelistbox.sip
+%Include tdelistview.sip
+%Include tdemainwindow.sip
+%Include tdemainwindowiface.sip
 %Include kmenubar.sip
 %Include kmessagebox.sip
 %Include knuminput.sip
@@ -92,13 +92,13 @@
 %Include kpanelmenu.sip
 %Include kpassdlg.sip
 %Include kpixmapio.sip
-%Include kpopupmenu.sip
+%Include tdepopupmenu.sip
 %Include kprogress.sip
 %Include kpushbutton.sip
 %Include krestrictedline.sip
 %Include krootpixmap.sip
 %Include kruler.sip
-%Include kselect.sip
+%Include tdeselect.sip
 %Include kseparator.sip
 %Include ksqueezedtextlabel.sip
 %Include kstatusbar.sip
@@ -109,9 +109,9 @@
 %Include ktabctl.sip
 %Include ktextbrowser.sip
 %Include ktip.sip
-%Include ktoolbar.sip
-%Include ktoolbarbutton.sip
-%Include ktoolbarradiogroup.sip
+%Include tdetoolbar.sip
+%Include tdetoolbarbutton.sip
+%Include tdetoolbarradiogroup.sip
 %Include kurllabel.sip
 %Include twindowlistmenu.sip
 %Include kwizard.sip