140 files changed, 244 insertions, 244 deletions

diff --git a/sip/kfile/kfile-kde314.diff b/sip/kfile/kfile-kde314.diff
deleted file mode 100644
index ddad6d6..0000000
--- a/sip/kfile/kfile-kde314.diff
+++ /dev/null
@@ -1,5 +0,0 @@
-+ %Include kcustommenueditor.sip
-+ %Include kdiskfreesp.sip
-+ %Include kfilesharedlg.sip
-+ %Include knotifydialog.sip
-+ %Include knotifywidgetbase.sip
diff --git a/sip/kfile/kfile-kde315.diff b/sip/kfile/kfile-kde315.diff
deleted file mode 100644
index ddad6d6..0000000
--- a/sip/kfile/kfile-kde315.diff
+++ /dev/null
@@ -1,5 +0,0 @@
-+ %Include kcustommenueditor.sip
-+ %Include kdiskfreesp.sip
-+ %Include kfilesharedlg.sip
-+ %Include knotifydialog.sip
-+ %Include knotifywidgetbase.sip
diff --git a/sip/kfile/kfile-kde331.diff b/sip/kfile/kfile-kde331.diff
deleted file mode 100644
index 2545aae..0000000
--- a/sip/kfile/kfile-kde331.diff
+++ /dev/null
@@ -1,5 +0,0 @@
-+ %Include kcustommenueditor.sip
-+ %Include kdiskfreesp.sip
-+ %Include kencodingfiledialog.sip
-+ %Include kfilesharedlg.sip
-+ %Include knotifydialog.sip
diff --git a/sip/kfile/kfile-kde332.diff b/sip/kfile/kfile-kde332.diff
deleted file mode 100644
index 2545aae..0000000
--- a/sip/kfile/kfile-kde332.diff
+++ /dev/null
@@ -1,5 +0,0 @@
-+ %Include kcustommenueditor.sip
-+ %Include kdiskfreesp.sip
-+ %Include kencodingfiledialog.sip
-+ %Include kfilesharedlg.sip
-+ %Include knotifydialog.sip
diff --git a/sip/kfile/kfile-kde340.diff b/sip/kfile/kfile-kde340.diff
deleted file mode 100644
index 2545aae..0000000
--- a/sip/kfile/kfile-kde340.diff
+++ /dev/null
@@ -1,5 +0,0 @@
-+ %Include kcustommenueditor.sip
-+ %Include kdiskfreesp.sip
-+ %Include kencodingfiledialog.sip
-+ %Include kfilesharedlg.sip
-+ %Include knotifydialog.sip
diff --git a/sip/kfile/kfile-kde341.diff b/sip/kfile/kfile-kde341.diff
deleted file mode 100644
index 2545aae..0000000
--- a/sip/kfile/kfile-kde341.diff
+++ /dev/null
@@ -1,5 +0,0 @@
-+ %Include kcustommenueditor.sip
-+ %Include kdiskfreesp.sip
-+ %Include kencodingfiledialog.sip
-+ %Include kfilesharedlg.sip
-+ %Include knotifydialog.sip
diff --git a/sip/kfile/kfile-kde342.diff b/sip/kfile/kfile-kde342.diff
deleted file mode 100644
index 2545aae..0000000
--- a/sip/kfile/kfile-kde342.diff
+++ /dev/null
@@ -1,5 +0,0 @@
-+ %Include kcustommenueditor.sip
-+ %Include kdiskfreesp.sip
-+ %Include kencodingfiledialog.sip
-+ %Include kfilesharedlg.sip
-+ %Include knotifydialog.sip
diff --git a/sip/kfile/kfile-kde343.diff b/sip/kfile/kfile-kde343.diff
deleted file mode 100644
index 2545aae..0000000
--- a/sip/kfile/kfile-kde343.diff
+++ /dev/null
@@ -1,5 +0,0 @@
-+ %Include kcustommenueditor.sip
-+ %Include kdiskfreesp.sip
-+ %Include kencodingfiledialog.sip
-+ %Include kfilesharedlg.sip
-+ %Include knotifydialog.sip
diff --git a/sip/kfile/kfile-kde350.diff b/sip/kfile/kfile-kde350.diff
deleted file mode 100644
index 2545aae..0000000
--- a/sip/kfile/kfile-kde350.diff
+++ /dev/null
@@ -1,5 +0,0 @@
-+ %Include kcustommenueditor.sip
-+ %Include kdiskfreesp.sip
-+ %Include kencodingfiledialog.sip
-+ %Include kfilesharedlg.sip
-+ %Include knotifydialog.sip
diff --git a/sip/kfile/kfile-kde351.diff b/sip/kfile/kfile-kde351.diff
deleted file mode 100644
index 2545aae..0000000
--- a/sip/kfile/kfile-kde351.diff
+++ /dev/null
@@ -1,5 +0,0 @@
-+ %Include kcustommenueditor.sip
-+ %Include kdiskfreesp.sip
-+ %Include kencodingfiledialog.sip
-+ %Include kfilesharedlg.sip
-+ %Include knotifydialog.sip
diff --git a/sip/kfile/kfile-kde353.diff b/sip/kfile/kfile-kde353.diff
deleted file mode 100644
index 2545aae..0000000
--- a/sip/kfile/kfile-kde353.diff
+++ /dev/null
@@ -1,5 +0,0 @@
-+ %Include kcustommenueditor.sip
-+ %Include kdiskfreesp.sip
-+ %Include kencodingfiledialog.sip
-+ %Include kfilesharedlg.sip
-+ %Include knotifydialog.sip
diff --git a/sip/kio/global.sip b/sip/kio/global.sip
index 6ba32e2..0923e77 100644
--- a/sip/kio/global.sip
+++ b/sip/kio/global.sip
@@ -24,7 +24,7 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 %ModuleHeaderCode
-#include <kio/global.h>
+#include <tdeio/global.h>
 %End
 
 namespace TDEIO
diff --git a/sip/kio/kdirlister.sip b/sip/kio/kdirlister.sip
index f41aa68..6adce18 100644
--- a/sip/kio/kdirlister.sip
+++ b/sip/kio/kdirlister.sip
@@ -129,7 +129,7 @@ protected:
 //converts a Python list of KFileItem
 {
 %TypeHeaderCode
-#include <kfileitem.h>
+#include <tdefileitem.h>
 %End
 
 %ConvertFromTypeCode
diff --git a/sip/kio/kio-kde310.diff b/sip/kio/kio-kde310.diff
index 89a40fb..7abe6b3 100644
--- a/sip/kio/kio-kde310.diff
+++ b/sip/kio/kio-kde310.diff
@@ -1,5 +1,5 @@
 + %Include davjob.sip
 + %Include kar.sip
-+ %Include kfileshare.sip
++ %Include tdefileshare.sip
 + %Include kzip.sip
 + %Include metainfojob.sip
diff --git a/sip/kio/kio-kde312.diff b/sip/kio/kio-kde312.diff
index 89a40fb..7abe6b3 100644
--- a/sip/kio/kio-kde312.diff
+++ b/sip/kio/kio-kde312.diff
@@ -1,5 +1,5 @@
 + %Include davjob.sip
 + %Include kar.sip
-+ %Include kfileshare.sip
++ %Include tdefileshare.sip
 + %Include kzip.sip
 + %Include metainfojob.sip
diff --git a/sip/kio/kio-kde313.diff b/sip/kio/kio-kde313.diff
index 89a40fb..7abe6b3 100644
--- a/sip/kio/kio-kde313.diff
+++ b/sip/kio/kio-kde313.diff
@@ -1,5 +1,5 @@
 + %Include davjob.sip
 + %Include kar.sip
-+ %Include kfileshare.sip
++ %Include tdefileshare.sip
 + %Include kzip.sip
 + %Include metainfojob.sip
diff --git a/sip/kio/kio-kde314.diff b/sip/kio/kio-kde314.diff
index 89a40fb..7abe6b3 100644
--- a/sip/kio/kio-kde314.diff
+++ b/sip/kio/kio-kde314.diff
@@ -1,5 +1,5 @@
 + %Include davjob.sip
 + %Include kar.sip
-+ %Include kfileshare.sip
++ %Include tdefileshare.sip
 + %Include kzip.sip
 + %Include metainfojob.sip
diff --git a/sip/kio/kio-kde315.diff b/sip/kio/kio-kde315.diff
index 89a40fb..7abe6b3 100644
--- a/sip/kio/kio-kde315.diff
+++ b/sip/kio/kio-kde315.diff
@@ -1,5 +1,5 @@
 + %Include davjob.sip
 + %Include kar.sip
-+ %Include kfileshare.sip
++ %Include tdefileshare.sip
 + %Include kzip.sip
 + %Include metainfojob.sip
diff --git a/sip/kio/kio-kde320.diff b/sip/kio/kio-kde320.diff
index 5124944..db94510 100644
--- a/sip/kio/kio-kde320.diff
+++ b/sip/kio/kio-kde320.diff
@@ -1,6 +1,6 @@
 + %Include davjob.sip
 + %Include kar.sip
 + %Include kdcopservicestarter.sip
-+ %Include kfileshare.sip
++ %Include tdefileshare.sip
 + %Include kzip.sip
 + %Include metainfojob.sip
diff --git a/sip/kio/kio-kde321.diff b/sip/kio/kio-kde321.diff
index 5124944..db94510 100644
--- a/sip/kio/kio-kde321.diff
+++ b/sip/kio/kio-kde321.diff
@@ -1,6 +1,6 @@
 + %Include davjob.sip
 + %Include kar.sip
 + %Include kdcopservicestarter.sip
-+ %Include kfileshare.sip
++ %Include tdefileshare.sip
 + %Include kzip.sip
 + %Include metainfojob.sip
diff --git a/sip/kio/kio-kde322.diff b/sip/kio/kio-kde322.diff
index 5124944..db94510 100644
--- a/sip/kio/kio-kde322.diff
+++ b/sip/kio/kio-kde322.diff
@@ -1,6 +1,6 @@
 + %Include davjob.sip
 + %Include kar.sip
 + %Include kdcopservicestarter.sip
-+ %Include kfileshare.sip
++ %Include tdefileshare.sip
 + %Include kzip.sip
 + %Include metainfojob.sip
diff --git a/sip/kio/kio-kde323.diff b/sip/kio/kio-kde323.diff
index 5124944..db94510 100644
--- a/sip/kio/kio-kde323.diff
+++ b/sip/kio/kio-kde323.diff
@@ -1,6 +1,6 @@
 + %Include davjob.sip
 + %Include kar.sip
 + %Include kdcopservicestarter.sip
-+ %Include kfileshare.sip
++ %Include tdefileshare.sip
 + %Include kzip.sip
 + %Include metainfojob.sip
diff --git a/sip/kio/kio-kde330.diff b/sip/kio/kio-kde330.diff
index 901fbeb..acae23f 100644
--- a/sip/kio/kio-kde330.diff
+++ b/sip/kio/kio-kde330.diff
@@ -1,7 +1,7 @@
 + %Include davjob.sip
 + %Include kar.sip
 + %Include kdcopservicestarter.sip
-+ %Include kfileshare.sip
++ %Include tdefileshare.sip
 + %Include kmimetypechooser.sip
 + %Include knfsshare.sip
 + %Include kremoteencoding.sip
diff --git a/sip/kio/kio-kde331.diff b/sip/kio/kio-kde331.diff
index 901fbeb..acae23f 100644
--- a/sip/kio/kio-kde331.diff
+++ b/sip/kio/kio-kde331.diff
@@ -1,7 +1,7 @@
 + %Include davjob.sip
 + %Include kar.sip
 + %Include kdcopservicestarter.sip
-+ %Include kfileshare.sip
++ %Include tdefileshare.sip
 + %Include kmimetypechooser.sip
 + %Include knfsshare.sip
 + %Include kremoteencoding.sip
diff --git a/sip/kio/kio-kde332.diff b/sip/kio/kio-kde332.diff
index 901fbeb..acae23f 100644
--- a/sip/kio/kio-kde332.diff
+++ b/sip/kio/kio-kde332.diff
@@ -1,7 +1,7 @@
 + %Include davjob.sip
 + %Include kar.sip
 + %Include kdcopservicestarter.sip
-+ %Include kfileshare.sip
++ %Include tdefileshare.sip
 + %Include kmimetypechooser.sip
 + %Include knfsshare.sip
 + %Include kremoteencoding.sip
diff --git a/sip/kio/kio-kde340.diff b/sip/kio/kio-kde340.diff
index 324b1d4..ee6caf2 100644
--- a/sip/kio/kio-kde340.diff
+++ b/sip/kio/kio-kde340.diff
@@ -2,7 +2,7 @@
 + %Include forwardingslavebase.sip
 + %Include kar.sip
 + %Include kdcopservicestarter.sip
-+ %Include kfileshare.sip
++ %Include tdefileshare.sip
 + %Include kmimetypechooser.sip
 + %Include knfsshare.sip
 + %Include kremoteencoding.sip
diff --git a/sip/kio/kio-kde341.diff b/sip/kio/kio-kde341.diff
index 324b1d4..ee6caf2 100644
--- a/sip/kio/kio-kde341.diff
+++ b/sip/kio/kio-kde341.diff
@@ -2,7 +2,7 @@
 + %Include forwardingslavebase.sip
 + %Include kar.sip
 + %Include kdcopservicestarter.sip
-+ %Include kfileshare.sip
++ %Include tdefileshare.sip
 + %Include kmimetypechooser.sip
 + %Include knfsshare.sip
 + %Include kremoteencoding.sip
diff --git a/sip/kio/kio-kde342.diff b/sip/kio/kio-kde342.diff
index 324b1d4..ee6caf2 100644
--- a/sip/kio/kio-kde342.diff
+++ b/sip/kio/kio-kde342.diff
@@ -2,7 +2,7 @@
 + %Include forwardingslavebase.sip
 + %Include kar.sip
 + %Include kdcopservicestarter.sip
-+ %Include kfileshare.sip
++ %Include tdefileshare.sip
 + %Include kmimetypechooser.sip
 + %Include knfsshare.sip
 + %Include kremoteencoding.sip
diff --git a/sip/kio/kio-kde343.diff b/sip/kio/kio-kde343.diff
index 324b1d4..ee6caf2 100644
--- a/sip/kio/kio-kde343.diff
+++ b/sip/kio/kio-kde343.diff
@@ -2,7 +2,7 @@
 + %Include forwardingslavebase.sip
 + %Include kar.sip
 + %Include kdcopservicestarter.sip
-+ %Include kfileshare.sip
++ %Include tdefileshare.sip
 + %Include kmimetypechooser.sip
 + %Include knfsshare.sip
 + %Include kremoteencoding.sip
diff --git a/sip/kio/kio-kde350.diff b/sip/kio/kio-kde350.diff
index 3d0cb01..a601d8b 100644
--- a/sip/kio/kio-kde350.diff
+++ b/sip/kio/kio-kde350.diff
@@ -3,7 +3,7 @@
 + %Include kacl.sip
 + %Include kar.sip
 + %Include kdcopservicestarter.sip
-+ %Include kfileshare.sip
++ %Include tdefileshare.sip
 + %Include kmimetypechooser.sip
 + %Include knfsshare.sip
 + %Include kremoteencoding.sip
diff --git a/sip/kio/kio-kde351.diff b/sip/kio/kio-kde351.diff
index 3d0cb01..a601d8b 100644
--- a/sip/kio/kio-kde351.diff
+++ b/sip/kio/kio-kde351.diff
@@ -3,7 +3,7 @@
 + %Include kacl.sip
 + %Include kar.sip
 + %Include kdcopservicestarter.sip
-+ %Include kfileshare.sip
++ %Include tdefileshare.sip
 + %Include kmimetypechooser.sip
 + %Include knfsshare.sip
 + %Include kremoteencoding.sip
diff --git a/sip/kio/kio-kde352.diff b/sip/kio/kio-kde352.diff
index 3d0cb01..a601d8b 100644
--- a/sip/kio/kio-kde352.diff
+++ b/sip/kio/kio-kde352.diff
@@ -3,7 +3,7 @@
 + %Include kacl.sip
 + %Include kar.sip
 + %Include kdcopservicestarter.sip
-+ %Include kfileshare.sip
++ %Include tdefileshare.sip
 + %Include kmimetypechooser.sip
 + %Include knfsshare.sip
 + %Include kremoteencoding.sip
diff --git a/sip/kio/kio-kde353.diff b/sip/kio/kio-kde353.diff
index 3d0cb01..a601d8b 100644
--- a/sip/kio/kio-kde353.diff
+++ b/sip/kio/kio-kde353.diff
@@ -3,7 +3,7 @@
 + %Include kacl.sip
 + %Include kar.sip
 + %Include kdcopservicestarter.sip
-+ %Include kfileshare.sip
++ %Include tdefileshare.sip
 + %Include kmimetypechooser.sip
 + %Include knfsshare.sip
 + %Include kremoteencoding.sip
diff --git a/sip/kio/kiomod.sip.in b/sip/kio/kiomod.sip.in
index 5439424..913a7dc 100644
--- a/sip/kio/kiomod.sip.in
+++ b/sip/kio/kiomod.sip.in
@@ -49,9 +49,9 @@
 %Include kdirnotify.sip
 %Include kdirwatch.sip
 %Include kemailsettings.sip
-%Include kfilefilter.sip
-%Include kfileitem.sip
-%Include kfilemetainfo.sip
+%Include tdefilefilter.sip
+%Include tdefileitem.sip
+%Include tdefilemetainfo.sip
 %Include kfilterbase.sip
 %Include kfilterdev.sip
 %Include kimageio.sip
diff --git a/sip/kio/metainfojob.sip b/sip/kio/metainfojob.sip
index 3433bd3..a20eb05 100644
--- a/sip/kio/metainfojob.sip
+++ b/sip/kio/metainfojob.sip
@@ -31,7 +31,7 @@ namespace TDEIO
 class MetaInfoJob : TDEIO::Job
 {
 %TypeHeaderCode
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <jobclasses.h>
 #include <metainfojob.h>
 %End
diff --git a/sip/kio/kfilefilter.sip b/sip/kio/tdefilefilter.sip
index 481f004..d86093a 100644
--- a/sip/kio/kfilefilter.sip
+++ b/sip/kio/tdefilefilter.sip
@@ -27,7 +27,7 @@
 class KFileFilter
 {
 %TypeHeaderCode
-#include <kfilefilter.h>
+#include <tdefilefilter.h>
 %End
 
 
@@ -43,7 +43,7 @@ protected:
 class KSimpleFileFilter : KFileFilter
 {
 %TypeHeaderCode
-#include <kfilefilter.h>
+#include <tdefilefilter.h>
 %End
 
 
diff --git a/sip/kio/kfileitem.sip b/sip/kio/tdefileitem.sip
index 3cf982b..da88569 100644
--- a/sip/kio/kfileitem.sip
+++ b/sip/kio/tdefileitem.sip
@@ -27,7 +27,7 @@
 class KFileItem
 {
 %TypeHeaderCode
-#include <kfileitem.h>
+#include <tdefileitem.h>
 %End
 
 
diff --git a/sip/kio/kfilemetainfo.sip b/sip/kio/tdefilemetainfo.sip
index a5d8b78..3053f6e 100644
--- a/sip/kio/kfilemetainfo.sip
+++ b/sip/kio/tdefilemetainfo.sip
@@ -27,7 +27,7 @@
 class KFileMimeTypeInfo
 {
 %TypeHeaderCode
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 %End
 
 
@@ -194,7 +194,7 @@ public:
 class KFileMetaInfoItem
 {
 %TypeHeaderCode
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 %End
 
 
@@ -237,7 +237,7 @@ protected:
 class KFileMetaInfoGroup
 {
 %TypeHeaderCode
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 %End
 
 
@@ -295,7 +295,7 @@ protected:
 class KFileMetaInfo
 {
 %TypeHeaderCode
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 %End
 
 
@@ -380,7 +380,7 @@ protected:
 class KFilePlugin : TQObject
 {
 %TypeHeaderCode
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 %End
 
 
@@ -413,7 +413,7 @@ protected:
 class KFileMetaInfoProvider : TQObject
 {
 %TypeHeaderCode
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 %End
 
 
diff --git a/sip/kio/kfileshare.sip b/sip/kio/tdefileshare.sip
index 8b917dd..a4e5aa2 100644
--- a/sip/kio/kfileshare.sip
+++ b/sip/kio/tdefileshare.sip
@@ -32,7 +32,7 @@
 class KFileShare
 {
 %TypeHeaderCode
-#include <kfileshare.h>
+#include <tdefileshare.h>
 %End
 
 
diff --git a/sip/tdecore/bytearray.sip b/sip/tdecore/bytearray.sip
index 507ef3c..743aff6 100644
--- a/sip/tdecore/bytearray.sip
+++ b/sip/tdecore/bytearray.sip
@@ -785,7 +785,7 @@ void dcop_add (TQDataStream& s, TQByteArray value)
 };
 
 
-//%MappedType TQMap<TQString,TQString> is available in tdecore/kconfig.sip
+//%MappedType TQMap<TQString,TQString> is available in tdecore/tdeconfig.sip
 
 
 %MappedType TQMap<TQString,TQByteArray>
diff --git a/sip/tdecore/kshortcutlist.sip b/sip/tdecore/kshortcutlist.sip
index 53ce168..e5eca23 100644
--- a/sip/tdecore/kshortcutlist.sip
+++ b/sip/tdecore/kshortcutlist.sip
@@ -27,7 +27,7 @@
 class KShortcutList
 {
 %TypeHeaderCode
-#include <kconfigbase.h>
+#include <tdeconfigbase.h>
 #include <kshortcut.h>
 #include <kshortcutlist.h>
 %End
@@ -68,7 +68,7 @@ protected:
 class KAccelShortcutList : KShortcutList
 {
 %TypeHeaderCode
-#include <kconfigbase.h>
+#include <tdeconfigbase.h>
 #include <kshortcut.h>
 #include <kshortcutlist.h>
 %End
@@ -104,7 +104,7 @@ namespace KStdAccel
 class ShortcutList : KShortcutList
 {
 %TypeHeaderCode
-#include <kconfigbase.h>
+#include <tdeconfigbase.h>
 #include <kshortcut.h>
 #include <kshortcutlist.h>
 %End
diff --git a/sip/tdecore/kconfig.sip b/sip/tdecore/tdeconfig.sip
index 1e30b31..c60c002 100644
--- a/sip/tdecore/kconfig.sip
+++ b/sip/tdecore/tdeconfig.sip
@@ -27,7 +27,7 @@
 class TDEConfig : TDEConfigBase
 {
 %TypeHeaderCode
-#include <kconfig.h>
+#include <tdeconfig.h>
 %End
 
 
@@ -82,7 +82,7 @@ protected:
 class KSharedConfig : TDEConfig, KShared
 {
 %TypeHeaderCode
-#include <kconfig.h>
+#include <tdeconfig.h>
 %End
 
 
@@ -197,7 +197,7 @@ private:
 {
 %TypeHeaderCode
 #include <ksharedptr.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 %End
 
 %ConvertFromTypeCode
diff --git a/sip/tdecore/kconfigbackend.sip b/sip/tdecore/tdeconfigbackend.sip
index 2df5316..1afa8e2 100644
--- a/sip/tdecore/kconfigbackend.sip
+++ b/sip/tdecore/tdeconfigbackend.sip
@@ -27,7 +27,7 @@
 class TDEConfigBackEnd
 {
 %TypeHeaderCode
-#include <kconfigbackend.h>
+#include <tdeconfigbackend.h>
 %End
 
 
@@ -66,8 +66,8 @@ protected:
 class TDEConfigINIBackEnd : TDEConfigBackEnd
 {
 %TypeHeaderCode
-#include <kconfigdata.h>
-#include <kconfigbackend.h>
+#include <tdeconfigdata.h>
+#include <tdeconfigbackend.h>
 %End
 
 
diff --git a/sip/tdecore/kconfigbase.sip b/sip/tdecore/tdeconfigbase.sip
index 2f9d9c9..53b36a2 100644
--- a/sip/tdecore/kconfigbase.sip
+++ b/sip/tdecore/tdeconfigbase.sip
@@ -33,7 +33,7 @@ typedef unsigned long long ulonglong;
 class TDEConfigBase : TQObject
 {
 %TypeHeaderCode
-#include <kconfigbase.h>
+#include <tdeconfigbase.h>
 %End
 
 
@@ -212,7 +212,7 @@ protected:
 class TDEConfigGroupSaver
 {
 %TypeHeaderCode
-#include <kconfigbase.h>
+#include <tdeconfigbase.h>
 %End
 
 
@@ -231,7 +231,7 @@ private:
 class TDEConfigGroup : TDEConfigBase
 {
 %TypeHeaderCode
-#include <kconfigbase.h>
+#include <tdeconfigbase.h>
 %End
 
 
diff --git a/sip/tdecore/kconfigdata.sip b/sip/tdecore/tdeconfigdata.sip
index 96a22cf..6c20ab9 100644
--- a/sip/tdecore/kconfigdata.sip
+++ b/sip/tdecore/tdeconfigdata.sip
@@ -27,7 +27,7 @@
 class KEntry
 {
 %TypeHeaderCode
-#include <kconfigdata.h>
+#include <tdeconfigdata.h>
 %End
 
 
@@ -51,7 +51,7 @@ public:
 class KEntryKey
 {
 %TypeHeaderCode
-#include <kconfigdata.h>
+#include <tdeconfigdata.h>
 %End
 
 
@@ -90,7 +90,7 @@ KEntryMap            testKEntryMap (SIP_PYOBJECT) [KEntryMap (KEntryMap)];
 {
 %TypeHeaderCode
 #include <tqmap.h>
-#include <kconfigdata.h>
+#include <tdeconfigdata.h>
 %End
 
 %ConvertFromTypeCode
diff --git a/sip/tdecore/kconfigdialogmanager.sip b/sip/tdecore/tdeconfigdialogmanager.sip
index cec0949..52e4951 100644
--- a/sip/tdecore/kconfigdialogmanager.sip
+++ b/sip/tdecore/tdeconfigdialogmanager.sip
@@ -29,7 +29,7 @@
 class TDEConfigDialogManager : TQObject
 {
 %TypeHeaderCode
-#include <kconfigdialogmanager.h>
+#include <tdeconfigdialogmanager.h>
 %End
 
 
diff --git a/sip/tdecore/kconfigskeleton.sip b/sip/tdecore/tdeconfigskeleton.sip
index 61e9b52..6e588c1 100644
--- a/sip/tdecore/kconfigskeleton.sip
+++ b/sip/tdecore/tdeconfigskeleton.sip
@@ -30,7 +30,7 @@ class TDEConfigSkeletonItem
 {
 %TypeHeaderCode
 #include <typeinfo>
-#include <kconfigskeleton.h>
+#include <tdeconfigskeleton.h>
 %End
 
 
@@ -122,7 +122,7 @@ protected:
 class TDEConfigSkeleton
 {
 %TypeHeaderCode
-#include <kconfigskeleton.h>
+#include <tdeconfigskeleton.h>
 typedef TQValueList<int> IntList;
 %End
 
@@ -1080,7 +1080,7 @@ public:
 %MappedType TQValueList<TDEConfigSkeleton::ItemEnum::Choice>
 {
 %TypeHeaderCode
-#include <kconfigskeleton.h>
+#include <tdeconfigskeleton.h>
 %End
 
 %ConvertFromTypeCode
diff --git a/sip/tdecore/tdecore-kde320.diff b/sip/tdecore/tdecore-kde320.diff
index 91d9a2c..5bce785 100644
--- a/sip/tdecore/tdecore-kde320.diff
+++ b/sip/tdecore/tdecore-kde320.diff
@@ -1,8 +1,8 @@
 + %Include kcalendarsystem.sip
 + %Include kcalendarsystemfactory.sip
 + %Include kclipboard.sip
-+ %Include kconfigdialogmanager.sip
-+ %Include kconfigskeleton.sip
++ %Include tdeconfigdialogmanager.sip
++ %Include tdeconfigskeleton.sip
 + %Include tdeversion.sip
 + %Include kidna.sip
 + %Include kmacroexpander.sip
diff --git a/sip/tdecore/tdecore-kde321.diff b/sip/tdecore/tdecore-kde321.diff
index 70ae29c..1e2c244 100644
--- a/sip/tdecore/tdecore-kde321.diff
+++ b/sip/tdecore/tdecore-kde321.diff
@@ -1,8 +1,8 @@
 + %Include kcalendarsystem.sip
 + %Include kcalendarsystemfactory.sip
 + %Include kclipboard.sip
-+ %Include kconfigdialogmanager.sip
-+ %Include kconfigskeleton.sip
++ %Include tdeconfigdialogmanager.sip
++ %Include tdeconfigskeleton.sip
 + %Include tdeversion.sip
 + %Include kidna.sip
 + %Include kmacroexpander.sip
diff --git a/sip/tdecore/tdecore-kde322.diff b/sip/tdecore/tdecore-kde322.diff
index 2114627..a4eb42c 100644
--- a/sip/tdecore/tdecore-kde322.diff
+++ b/sip/tdecore/tdecore-kde322.diff
@@ -2,8 +2,8 @@
 + %Include kcalendarsystem.sip
 + %Include kcalendarsystemfactory.sip
 + %Include kclipboard.sip
-+ %Include kconfigdialogmanager.sip
-+ %Include kconfigskeleton.sip
++ %Include tdeconfigdialogmanager.sip
++ %Include tdeconfigskeleton.sip
 + %Include tdeversion.sip
 + %Include kidna.sip
 + %Include kmacroexpander.sip
diff --git a/sip/tdecore/tdecore-kde323.diff b/sip/tdecore/tdecore-kde323.diff
index 2114627..a4eb42c 100644
--- a/sip/tdecore/tdecore-kde323.diff
+++ b/sip/tdecore/tdecore-kde323.diff
@@ -2,8 +2,8 @@
 + %Include kcalendarsystem.sip
 + %Include kcalendarsystemfactory.sip
 + %Include kclipboard.sip
-+ %Include kconfigdialogmanager.sip
-+ %Include kconfigskeleton.sip
++ %Include tdeconfigdialogmanager.sip
++ %Include tdeconfigskeleton.sip
 + %Include tdeversion.sip
 + %Include kidna.sip
 + %Include kmacroexpander.sip
diff --git a/sip/tdecore/tdecore-kde330.diff b/sip/tdecore/tdecore-kde330.diff
index 335a5f4..906da95 100644
--- a/sip/tdecore/tdecore-kde330.diff
+++ b/sip/tdecore/tdecore-kde330.diff
@@ -2,8 +2,8 @@
 + %Include kcalendarsystem.sip
 + %Include kcalendarsystemfactory.sip
 + %Include kclipboard.sip
-+ %Include kconfigdialogmanager.sip
-+ %Include kconfigskeleton.sip
++ %Include tdeconfigdialogmanager.sip
++ %Include tdeconfigskeleton.sip
 + %Include tdeversion.sip
 + %Include kidna.sip
 + %Include klockfile.sip
diff --git a/sip/tdecore/tdecore-kde331.diff b/sip/tdecore/tdecore-kde331.diff
index 335a5f4..906da95 100644
--- a/sip/tdecore/tdecore-kde331.diff
+++ b/sip/tdecore/tdecore-kde331.diff
@@ -2,8 +2,8 @@
 + %Include kcalendarsystem.sip
 + %Include kcalendarsystemfactory.sip
 + %Include kclipboard.sip
-+ %Include kconfigdialogmanager.sip
-+ %Include kconfigskeleton.sip
++ %Include tdeconfigdialogmanager.sip
++ %Include tdeconfigskeleton.sip
 + %Include tdeversion.sip
 + %Include kidna.sip
 + %Include klockfile.sip
diff --git a/sip/tdecore/tdecore-kde332.diff b/sip/tdecore/tdecore-kde332.diff
index 335a5f4..906da95 100644
--- a/sip/tdecore/tdecore-kde332.diff
+++ b/sip/tdecore/tdecore-kde332.diff
@@ -2,8 +2,8 @@
 + %Include kcalendarsystem.sip
 + %Include kcalendarsystemfactory.sip
 + %Include kclipboard.sip
-+ %Include kconfigdialogmanager.sip
-+ %Include kconfigskeleton.sip
++ %Include tdeconfigdialogmanager.sip
++ %Include tdeconfigskeleton.sip
 + %Include tdeversion.sip
 + %Include kidna.sip
 + %Include klockfile.sip
diff --git a/sip/tdecore/tdecore-kde340.diff b/sip/tdecore/tdecore-kde340.diff
index 335a5f4..906da95 100644
--- a/sip/tdecore/tdecore-kde340.diff
+++ b/sip/tdecore/tdecore-kde340.diff
@@ -2,8 +2,8 @@
 + %Include kcalendarsystem.sip
 + %Include kcalendarsystemfactory.sip
 + %Include kclipboard.sip
-+ %Include kconfigdialogmanager.sip
-+ %Include kconfigskeleton.sip
++ %Include tdeconfigdialogmanager.sip
++ %Include tdeconfigskeleton.sip
 + %Include tdeversion.sip
 + %Include kidna.sip
 + %Include klockfile.sip
diff --git a/sip/tdecore/tdecore-kde341.diff b/sip/tdecore/tdecore-kde341.diff
index 335a5f4..906da95 100644
--- a/sip/tdecore/tdecore-kde341.diff
+++ b/sip/tdecore/tdecore-kde341.diff
@@ -2,8 +2,8 @@
 + %Include kcalendarsystem.sip
 + %Include kcalendarsystemfactory.sip
 + %Include kclipboard.sip
-+ %Include kconfigdialogmanager.sip
-+ %Include kconfigskeleton.sip
++ %Include tdeconfigdialogmanager.sip
++ %Include tdeconfigskeleton.sip
 + %Include tdeversion.sip
 + %Include kidna.sip
 + %Include klockfile.sip
diff --git a/sip/tdecore/tdecore-kde342.diff b/sip/tdecore/tdecore-kde342.diff
index 335a5f4..906da95 100644
--- a/sip/tdecore/tdecore-kde342.diff
+++ b/sip/tdecore/tdecore-kde342.diff
@@ -2,8 +2,8 @@
 + %Include kcalendarsystem.sip
 + %Include kcalendarsystemfactory.sip
 + %Include kclipboard.sip
-+ %Include kconfigdialogmanager.sip
-+ %Include kconfigskeleton.sip
++ %Include tdeconfigdialogmanager.sip
++ %Include tdeconfigskeleton.sip
 + %Include tdeversion.sip
 + %Include kidna.sip
 + %Include klockfile.sip
diff --git a/sip/tdecore/tdecore-kde343.diff b/sip/tdecore/tdecore-kde343.diff
index 335a5f4..906da95 100644
--- a/sip/tdecore/tdecore-kde343.diff
+++ b/sip/tdecore/tdecore-kde343.diff
@@ -2,8 +2,8 @@
 + %Include kcalendarsystem.sip
 + %Include kcalendarsystemfactory.sip
 + %Include kclipboard.sip
-+ %Include kconfigdialogmanager.sip
-+ %Include kconfigskeleton.sip
++ %Include tdeconfigdialogmanager.sip
++ %Include tdeconfigskeleton.sip
 + %Include tdeversion.sip
 + %Include kidna.sip
 + %Include klockfile.sip
diff --git a/sip/tdecore/tdecore-kde350.diff b/sip/tdecore/tdecore-kde350.diff
index 72166a8..1d1dca9 100644
--- a/sip/tdecore/tdecore-kde350.diff
+++ b/sip/tdecore/tdecore-kde350.diff
@@ -2,8 +2,8 @@
 + %Include kcalendarsystem.sip
 + %Include kcalendarsystemfactory.sip
 + %Include kclipboard.sip
-+ %Include kconfigdialogmanager.sip
-+ %Include kconfigskeleton.sip
++ %Include tdeconfigdialogmanager.sip
++ %Include tdeconfigskeleton.sip
 + %Include tdeversion.sip
 + %Include kidna.sip
 + %Include klockfile.sip
diff --git a/sip/tdecore/tdecore-kde351.diff b/sip/tdecore/tdecore-kde351.diff
index 72166a8..1d1dca9 100644
--- a/sip/tdecore/tdecore-kde351.diff
+++ b/sip/tdecore/tdecore-kde351.diff
@@ -2,8 +2,8 @@
 + %Include kcalendarsystem.sip
 + %Include kcalendarsystemfactory.sip
 + %Include kclipboard.sip
-+ %Include kconfigdialogmanager.sip
-+ %Include kconfigskeleton.sip
++ %Include tdeconfigdialogmanager.sip
++ %Include tdeconfigskeleton.sip
 + %Include tdeversion.sip
 + %Include kidna.sip
 + %Include klockfile.sip
diff --git a/sip/tdecore/tdecore-kde352.diff b/sip/tdecore/tdecore-kde352.diff
index 72166a8..1d1dca9 100644
--- a/sip/tdecore/tdecore-kde352.diff
+++ b/sip/tdecore/tdecore-kde352.diff
@@ -2,8 +2,8 @@
 + %Include kcalendarsystem.sip
 + %Include kcalendarsystemfactory.sip
 + %Include kclipboard.sip
-+ %Include kconfigdialogmanager.sip
-+ %Include kconfigskeleton.sip
++ %Include tdeconfigdialogmanager.sip
++ %Include tdeconfigskeleton.sip
 + %Include tdeversion.sip
 + %Include kidna.sip
 + %Include klockfile.sip
diff --git a/sip/tdecore/tdecore-kde353.diff b/sip/tdecore/tdecore-kde353.diff
index 72166a8..1d1dca9 100644
--- a/sip/tdecore/tdecore-kde353.diff
+++ b/sip/tdecore/tdecore-kde353.diff
@@ -2,8 +2,8 @@
 + %Include kcalendarsystem.sip
 + %Include kcalendarsystemfactory.sip
 + %Include kclipboard.sip
-+ %Include kconfigdialogmanager.sip
-+ %Include kconfigskeleton.sip
++ %Include tdeconfigdialogmanager.sip
++ %Include tdeconfigskeleton.sip
 + %Include tdeversion.sip
 + %Include kidna.sip
 + %Include klockfile.sip
diff --git a/sip/tdecore/tdecoremod.sip.in b/sip/tdecore/tdecoremod.sip.in
index 27f0764..28b89d6 100644
--- a/sip/tdecore/tdecoremod.sip.in
+++ b/sip/tdecore/tdecoremod.sip.in
@@ -45,10 +45,10 @@
 %Include kcharsets.sip
 %Include kcmdlineargs.sip
 %Include kcompletion.sip
-%Include kconfig.sip
-%Include kconfigbackend.sip
-%Include kconfigbase.sip
-%Include kconfigdata.sip
+%Include tdeconfig.sip
+%Include tdeconfigbackend.sip
+%Include tdeconfigbase.sip
+%Include tdeconfigdata.sip
 %Include kcrash.sip
 %Include kdcoppropertyproxy.sip
 %Include kdesktopfile.sip
diff --git a/sip/kfile/booktoken.sip b/sip/tdefile/booktoken.sip
index 182f5cd..2b44f8e 100644
--- a/sip/kfile/booktoken.sip
+++ b/sip/tdefile/booktoken.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE_3_1_1
+//            module tdefile  version KDE_3_1_1
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kfile/kcombiview.sip b/sip/tdefile/kcombiview.sip
index 6e44ab4..e78209d 100644
--- a/sip/kfile/kcombiview.sip
+++ b/sip/tdefile/kcombiview.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE 3.5.3
+//            module tdefile  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kfile/kcustommenueditor.sip b/sip/tdefile/kcustommenueditor.sip
index 733d7bd..fe8376e 100644
--- a/sip/kfile/kcustommenueditor.sip
+++ b/sip/tdefile/kcustommenueditor.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE 3.5.3
+//            module tdefile  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kfile/kdiroperator.sip b/sip/tdefile/kdiroperator.sip
index 31ac0e2..4fa74b2 100644
--- a/sip/kfile/kdiroperator.sip
+++ b/sip/tdefile/kdiroperator.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE 3.5.3
+//            module tdefile  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kfile/kdirselectdialog.sip b/sip/tdefile/kdirselectdialog.sip
index d464907..f026846 100644
--- a/sip/kfile/kdirselectdialog.sip
+++ b/sip/tdefile/kdirselectdialog.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE 3.5.3
+//            module tdefile  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kfile/kdirsize.sip b/sip/tdefile/kdirsize.sip
index 2f0a553..ae05e31 100644
--- a/sip/kfile/kdirsize.sip
+++ b/sip/tdefile/kdirsize.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE 3.5.3
+//            module tdefile  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kfile/kdiskfreesp.sip b/sip/tdefile/kdiskfreesp.sip
index 4e8433b..53d2a7f 100644
--- a/sip/kfile/kdiskfreesp.sip
+++ b/sip/tdefile/kdiskfreesp.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE 3.5.3
+//            module tdefile  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kfile/kencodingfiledialog.sip b/sip/tdefile/kencodingfiledialog.sip
index 9214b47..7528fd9 100644
--- a/sip/kfile/kencodingfiledialog.sip
+++ b/sip/tdefile/kencodingfiledialog.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE 3.5.3
+//            module tdefile  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kfile/kicondialog.sip b/sip/tdefile/kicondialog.sip
index 819bac2..eebdcb0 100644
--- a/sip/kfile/kicondialog.sip
+++ b/sip/tdefile/kicondialog.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE 3.5.3
+//            module tdefile  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kfile/kimagefilepreview.sip b/sip/tdefile/kimagefilepreview.sip
index 808b307..8c8cbe7 100644
--- a/sip/kfile/kimagefilepreview.sip
+++ b/sip/tdefile/kimagefilepreview.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE 3.5.3
+//            module tdefile  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kfile/knotifydialog.sip b/sip/tdefile/knotifydialog.sip
index ad16340..4f20a13 100644
--- a/sip/kfile/knotifydialog.sip
+++ b/sip/tdefile/knotifydialog.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE 3.5.3
+//            module tdefile  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kfile/knotifywidgetbase.sip b/sip/tdefile/knotifywidgetbase.sip
index f83b853..d5ec44d 100644
--- a/sip/kfile/knotifywidgetbase.sip
+++ b/sip/tdefile/knotifywidgetbase.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE_3_1_4
+//            module tdefile  version KDE_3_1_4
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kfile/kopenwith.sip b/sip/tdefile/kopenwith.sip
index 840186d..a85e671 100644
--- a/sip/kfile/kopenwith.sip
+++ b/sip/tdefile/kopenwith.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE 3.5.3
+//            module tdefile  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kfile/kpreviewwidgetbase.sip b/sip/tdefile/kpreviewwidgetbase.sip
index cb44f70..eb49029 100644
--- a/sip/kfile/kpreviewwidgetbase.sip
+++ b/sip/tdefile/kpreviewwidgetbase.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE 3.5.3
+//            module tdefile  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kfile/kpropertiesdialog.sip b/sip/tdefile/kpropertiesdialog.sip
index 5229058..63047e6 100644
--- a/sip/kfile/kpropertiesdialog.sip
+++ b/sip/tdefile/kpropertiesdialog.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE 3.5.3
+//            module tdefile  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kfile/kpropsdlg.sip b/sip/tdefile/kpropsdlg.sip
index 81d697f..f245a6f 100644
--- a/sip/kfile/kpropsdlg.sip
+++ b/sip/tdefile/kpropsdlg.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE_3_1_1
+//            module tdefile  version KDE_3_1_1
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kfile/krecentdirs.sip b/sip/tdefile/krecentdirs.sip
index 31fed75..ef79698 100644
--- a/sip/kfile/krecentdirs.sip
+++ b/sip/tdefile/krecentdirs.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE_3_5_0
+//            module tdefile  version KDE_3_5_0
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kfile/krecentdocument.sip b/sip/tdefile/krecentdocument.sip
index 7e4c8cc..c81a337 100644
--- a/sip/kfile/krecentdocument.sip
+++ b/sip/tdefile/krecentdocument.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE 3.5.3
+//            module tdefile  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kfile/kurlbar.sip b/sip/tdefile/kurlbar.sip
index d6e92f9..cbfc1c4 100644
--- a/sip/kfile/kurlbar.sip
+++ b/sip/tdefile/kurlbar.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE 3.5.3
+//            module tdefile  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kfile/kurlcombobox.sip b/sip/tdefile/kurlcombobox.sip
index 09e36a5..2f3079a 100644
--- a/sip/kfile/kurlcombobox.sip
+++ b/sip/tdefile/kurlcombobox.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE 3.5.3
+//            module tdefile  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kfile/kurlrequester.sip b/sip/tdefile/kurlrequester.sip
index 9d44788..5fee9c5 100644
--- a/sip/kfile/kurlrequester.sip
+++ b/sip/tdefile/kurlrequester.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE 3.5.3
+//            module tdefile  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kfile/kurlrequesterdlg.sip b/sip/tdefile/kurlrequesterdlg.sip
index d58e786..62177af 100644
--- a/sip/kfile/kurlrequesterdlg.sip
+++ b/sip/tdefile/kurlrequesterdlg.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE 3.5.3
+//            module tdefile  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
diff --git a/sip/kfile/kfile-kde310.diff b/sip/tdefile/tdefile-kde310.diff
index ddad6d6..2b12be0 100644
--- a/sip/kfile/kfile-kde310.diff
+++ b/sip/tdefile/tdefile-kde310.diff
@@ -1,5 +1,5 @@
 + %Include kcustommenueditor.sip
 + %Include kdiskfreesp.sip
-+ %Include kfilesharedlg.sip
++ %Include tdefilesharedlg.sip
 + %Include knotifydialog.sip
 + %Include knotifywidgetbase.sip
diff --git a/sip/kfile/kfile-kde311.diff b/sip/tdefile/tdefile-kde311.diff
index ddad6d6..2b12be0 100644
--- a/sip/kfile/kfile-kde311.diff
+++ b/sip/tdefile/tdefile-kde311.diff
@@ -1,5 +1,5 @@
 + %Include kcustommenueditor.sip
 + %Include kdiskfreesp.sip
-+ %Include kfilesharedlg.sip
++ %Include tdefilesharedlg.sip
 + %Include knotifydialog.sip
 + %Include knotifywidgetbase.sip
diff --git a/sip/kfile/kfile-kde312.diff b/sip/tdefile/tdefile-kde312.diff
index ddad6d6..2b12be0 100644
--- a/sip/kfile/kfile-kde312.diff
+++ b/sip/tdefile/tdefile-kde312.diff
@@ -1,5 +1,5 @@
 + %Include kcustommenueditor.sip
 + %Include kdiskfreesp.sip
-+ %Include kfilesharedlg.sip
++ %Include tdefilesharedlg.sip
 + %Include knotifydialog.sip
 + %Include knotifywidgetbase.sip
diff --git a/sip/kfile/kfile-kde313.diff b/sip/tdefile/tdefile-kde313.diff
index ddad6d6..2b12be0 100644
--- a/sip/kfile/kfile-kde313.diff
+++ b/sip/tdefile/tdefile-kde313.diff
@@ -1,5 +1,5 @@
 + %Include kcustommenueditor.sip
 + %Include kdiskfreesp.sip
-+ %Include kfilesharedlg.sip
++ %Include tdefilesharedlg.sip
 + %Include knotifydialog.sip
 + %Include knotifywidgetbase.sip
diff --git a/sip/tdefile/tdefile-kde314.diff b/sip/tdefile/tdefile-kde314.diff
new file mode 100644
index 0000000..2b12be0
--- /dev/null
+++ b/sip/tdefile/tdefile-kde314.diff
@@ -0,0 +1,5 @@
++ %Include kcustommenueditor.sip
++ %Include kdiskfreesp.sip
++ %Include tdefilesharedlg.sip
++ %Include knotifydialog.sip
++ %Include knotifywidgetbase.sip
diff --git a/sip/tdefile/tdefile-kde315.diff b/sip/tdefile/tdefile-kde315.diff
new file mode 100644
index 0000000..2b12be0
--- /dev/null
+++ b/sip/tdefile/tdefile-kde315.diff
@@ -0,0 +1,5 @@
++ %Include kcustommenueditor.sip
++ %Include kdiskfreesp.sip
++ %Include tdefilesharedlg.sip
++ %Include knotifydialog.sip
++ %Include knotifywidgetbase.sip
diff --git a/sip/kfile/kfile-kde320.diff b/sip/tdefile/tdefile-kde320.diff
index f5ab9bd..ad75de7 100644
--- a/sip/kfile/kfile-kde320.diff
+++ b/sip/tdefile/tdefile-kde320.diff
@@ -1,6 +1,6 @@
 + %Include kcustommenueditor.sip
 + %Include kdiskfreesp.sip
 + %Include kencodingfiledialog.sip
-+ %Include kfilesharedlg.sip
++ %Include tdefilesharedlg.sip
 + %Include knotifydialog.sip
 + %Include knotifywidgetbase.sip
\ No newline at end of file
diff --git a/sip/kfile/kfile-kde330.diff b/sip/tdefile/tdefile-kde321.diff
index 2545aae..199a42d 100644
--- a/sip/kfile/kfile-kde330.diff
+++ b/sip/tdefile/tdefile-kde321.diff
@@ -1,5 +1,5 @@
 + %Include kcustommenueditor.sip
 + %Include kdiskfreesp.sip
 + %Include kencodingfiledialog.sip
-+ %Include kfilesharedlg.sip
++ %Include tdefilesharedlg.sip
 + %Include knotifydialog.sip
diff --git a/sip/kfile/kfile-kde321.diff b/sip/tdefile/tdefile-kde322.diff
index 2545aae..199a42d 100644
--- a/sip/kfile/kfile-kde321.diff
+++ b/sip/tdefile/tdefile-kde322.diff
@@ -1,5 +1,5 @@
 + %Include kcustommenueditor.sip
 + %Include kdiskfreesp.sip
 + %Include kencodingfiledialog.sip
-+ %Include kfilesharedlg.sip
++ %Include tdefilesharedlg.sip
 + %Include knotifydialog.sip
diff --git a/sip/kfile/kfile-kde322.diff b/sip/tdefile/tdefile-kde323.diff
index 2545aae..199a42d 100644
--- a/sip/kfile/kfile-kde322.diff
+++ b/sip/tdefile/tdefile-kde323.diff
@@ -1,5 +1,5 @@
 + %Include kcustommenueditor.sip
 + %Include kdiskfreesp.sip
 + %Include kencodingfiledialog.sip
-+ %Include kfilesharedlg.sip
++ %Include tdefilesharedlg.sip
 + %Include knotifydialog.sip
diff --git a/sip/kfile/kfile-kde323.diff b/sip/tdefile/tdefile-kde330.diff
index 2545aae..199a42d 100644
--- a/sip/kfile/kfile-kde323.diff
+++ b/sip/tdefile/tdefile-kde330.diff
@@ -1,5 +1,5 @@
 + %Include kcustommenueditor.sip
 + %Include kdiskfreesp.sip
 + %Include kencodingfiledialog.sip
-+ %Include kfilesharedlg.sip
++ %Include tdefilesharedlg.sip
 + %Include knotifydialog.sip
diff --git a/sip/tdefile/tdefile-kde331.diff b/sip/tdefile/tdefile-kde331.diff
new file mode 100644
index 0000000..199a42d
--- /dev/null
+++ b/sip/tdefile/tdefile-kde331.diff
@@ -0,0 +1,5 @@
++ %Include kcustommenueditor.sip
++ %Include kdiskfreesp.sip
++ %Include kencodingfiledialog.sip
++ %Include tdefilesharedlg.sip
++ %Include knotifydialog.sip
diff --git a/sip/tdefile/tdefile-kde332.diff b/sip/tdefile/tdefile-kde332.diff
new file mode 100644
index 0000000..199a42d
--- /dev/null
+++ b/sip/tdefile/tdefile-kde332.diff
@@ -0,0 +1,5 @@
++ %Include kcustommenueditor.sip
++ %Include kdiskfreesp.sip
++ %Include kencodingfiledialog.sip
++ %Include tdefilesharedlg.sip
++ %Include knotifydialog.sip
diff --git a/sip/tdefile/tdefile-kde340.diff b/sip/tdefile/tdefile-kde340.diff
new file mode 100644
index 0000000..199a42d
--- /dev/null
+++ b/sip/tdefile/tdefile-kde340.diff
@@ -0,0 +1,5 @@
++ %Include kcustommenueditor.sip
++ %Include kdiskfreesp.sip
++ %Include kencodingfiledialog.sip
++ %Include tdefilesharedlg.sip
++ %Include knotifydialog.sip
diff --git a/sip/tdefile/tdefile-kde341.diff b/sip/tdefile/tdefile-kde341.diff
new file mode 100644
index 0000000..199a42d
--- /dev/null
+++ b/sip/tdefile/tdefile-kde341.diff
@@ -0,0 +1,5 @@
++ %Include kcustommenueditor.sip
++ %Include kdiskfreesp.sip
++ %Include kencodingfiledialog.sip
++ %Include tdefilesharedlg.sip
++ %Include knotifydialog.sip
diff --git a/sip/tdefile/tdefile-kde342.diff b/sip/tdefile/tdefile-kde342.diff
new file mode 100644
index 0000000..199a42d
--- /dev/null
+++ b/sip/tdefile/tdefile-kde342.diff
@@ -0,0 +1,5 @@
++ %Include kcustommenueditor.sip
++ %Include kdiskfreesp.sip
++ %Include kencodingfiledialog.sip
++ %Include tdefilesharedlg.sip
++ %Include knotifydialog.sip
diff --git a/sip/tdefile/tdefile-kde343.diff b/sip/tdefile/tdefile-kde343.diff
new file mode 100644
index 0000000..199a42d
--- /dev/null
+++ b/sip/tdefile/tdefile-kde343.diff
@@ -0,0 +1,5 @@
++ %Include kcustommenueditor.sip
++ %Include kdiskfreesp.sip
++ %Include kencodingfiledialog.sip
++ %Include tdefilesharedlg.sip
++ %Include knotifydialog.sip
diff --git a/sip/tdefile/tdefile-kde350.diff b/sip/tdefile/tdefile-kde350.diff
new file mode 100644
index 0000000..199a42d
--- /dev/null
+++ b/sip/tdefile/tdefile-kde350.diff
@@ -0,0 +1,5 @@
++ %Include kcustommenueditor.sip
++ %Include kdiskfreesp.sip
++ %Include kencodingfiledialog.sip
++ %Include tdefilesharedlg.sip
++ %Include knotifydialog.sip
diff --git a/sip/tdefile/tdefile-kde351.diff b/sip/tdefile/tdefile-kde351.diff
new file mode 100644
index 0000000..199a42d
--- /dev/null
+++ b/sip/tdefile/tdefile-kde351.diff
@@ -0,0 +1,5 @@
++ %Include kcustommenueditor.sip
++ %Include kdiskfreesp.sip
++ %Include kencodingfiledialog.sip
++ %Include tdefilesharedlg.sip
++ %Include knotifydialog.sip
diff --git a/sip/kfile/kfile-kde352.diff b/sip/tdefile/tdefile-kde352.diff
index 81a0603..9083bb6 100644
--- a/sip/kfile/kfile-kde352.diff
+++ b/sip/tdefile/tdefile-kde352.diff
@@ -2,5 +2,5 @@
 + %Include kcustommenueditor.sip
 + %Include kdiskfreesp.sip
 + %Include kencodingfiledialog.sip
-+ %Include kfilesharedlg.sip
++ %Include tdefilesharedlg.sip
 + %Include knotifydialog.sip
diff --git a/sip/tdefile/tdefile-kde353.diff b/sip/tdefile/tdefile-kde353.diff
new file mode 100644
index 0000000..199a42d
--- /dev/null
+++ b/sip/tdefile/tdefile-kde353.diff
@@ -0,0 +1,5 @@
++ %Include kcustommenueditor.sip
++ %Include kdiskfreesp.sip
++ %Include kencodingfiledialog.sip
++ %Include tdefilesharedlg.sip
++ %Include knotifydialog.sip
diff --git a/sip/kfile/kfile.sip b/sip/tdefile/tdefile.sip
index e145655..4ec3611 100644
--- a/sip/kfile/kfile.sip
+++ b/sip/tdefile/tdefile.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE 3.5.3
+//            module tdefile  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
@@ -27,7 +27,7 @@
 class KFile
 {
 %TypeHeaderCode
-#include <kfile.h>
+#include <tdefile.h>
 %End
 
 
diff --git a/sip/kfile/kfilebookmark.sip b/sip/tdefile/tdefilebookmark.sip
index 59315ab..9623a7a 100644
--- a/sip/kfile/kfilebookmark.sip
+++ b/sip/tdefile/tdefilebookmark.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE_3_1_1
+//            module tdefile  version KDE_3_1_1
 
 
 // This software is free software; you can redistribute it and/or
@@ -27,7 +27,7 @@
 class KFileBookmark
 {
 %TypeHeaderCode
-#include <kfilebookmark.h>
+#include <tdefilebookmark.h>
 %End
 
 
@@ -56,7 +56,7 @@ public:
 class KFileBookmarkManager : TQObject
 {
 %TypeHeaderCode
-#include <kfilebookmark.h>
+#include <tdefilebookmark.h>
 %End
 
 
diff --git a/sip/kfile/kfiledetailview.sip b/sip/tdefile/tdefiledetailview.sip
index 0b7e13e..a75da9d 100644
--- a/sip/kfile/kfiledetailview.sip
+++ b/sip/tdefile/tdefiledetailview.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE 3.5.3
+//            module tdefile  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
@@ -27,7 +27,7 @@
 class KFileListViewItem : KListViewItem
 {
 %TypeHeaderCode
-#include <kfiledetailview.h>
+#include <tdefiledetailview.h>
 %End
 
 
@@ -55,7 +55,7 @@ public:
 class KFileDetailView : KListView, KFileView
 {
 %TypeHeaderCode
-#include <kfiledetailview.h>
+#include <tdefiledetailview.h>
 %End
 
 
diff --git a/sip/kfile/kfiledialog.sip b/sip/tdefile/tdefiledialog.sip
index 9b68e13..c7142ee 100644
--- a/sip/kfile/kfiledialog.sip
+++ b/sip/tdefile/tdefiledialog.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE 3.5.3
+//            module tdefile  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
@@ -27,7 +27,7 @@
 class KFileDialog : KDialogBase
 {
 %TypeHeaderCode
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 %End
 
 
diff --git a/sip/kfile/kfilefiltercombo.sip b/sip/tdefile/tdefilefiltercombo.sip
index 28f43d2..78e5969 100644
--- a/sip/kfile/kfilefiltercombo.sip
+++ b/sip/tdefile/tdefilefiltercombo.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE 3.5.3
+//            module tdefile  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
@@ -27,7 +27,7 @@
 class KFileFilterCombo : KComboBox
 {
 %TypeHeaderCode
-#include <kfilefiltercombo.h>
+#include <tdefilefiltercombo.h>
 %End
 
 
diff --git a/sip/kfile/kfileiconview.sip b/sip/tdefile/tdefileiconview.sip
index e7717ae..bd69889 100644
--- a/sip/kfile/kfileiconview.sip
+++ b/sip/tdefile/tdefileiconview.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE 3.5.3
+//            module tdefile  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
@@ -27,7 +27,7 @@
 class KFileIconViewItem : KIconViewItem
 {
 %TypeHeaderCode
-#include <kfileiconview.h>
+#include <tdefileiconview.h>
 %End
 
 
@@ -46,7 +46,7 @@ public:
 class KFileIconView : KIconView, KFileView
 {
 %TypeHeaderCode
-#include <kfileiconview.h>
+#include <tdefileiconview.h>
 %End
 
 
diff --git a/sip/kfile/kfilemod.sip.in b/sip/tdefile/tdefilemod.sip.in
index 34e1179..7246ceb 100644
--- a/sip/kfile/kfilemod.sip.in
+++ b/sip/tdefile/tdefilemod.sip.in
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE_3_5_2
+//            module tdefile  version KDE_3_5_2
 
 %Copying
 
@@ -26,7 +26,7 @@
 
 %End
 
-%Module kfile
+%Module tdefile
 
 %Import qt/qtmod.sip
 %Import qtxml/qtxmlmod.sip
@@ -40,16 +40,16 @@
 %Include kdiroperator.sip
 %Include kdirselectdialog.sip
 %Include kdirsize.sip
-%Include kfile.sip
-%Include kfiledetailview.sip
-%Include kfiledialog.sip
-%Include kfilefiltercombo.sip
-%Include kfileiconview.sip
-%Include kfilepreview.sip
-%Include kfiletreebranch.sip
-%Include kfiletreeview.sip
-%Include kfiletreeviewitem.sip
-%Include kfileview.sip
+%Include tdefile.sip
+%Include tdefiledetailview.sip
+%Include tdefiledialog.sip
+%Include tdefilefiltercombo.sip
+%Include tdefileiconview.sip
+%Include tdefilepreview.sip
+%Include tdefiletreebranch.sip
+%Include tdefiletreeview.sip
+%Include tdefiletreeviewitem.sip
+%Include tdefileview.sip
 %Include kicondialog.sip
 %Include kimagefilepreview.sip
 %Include kopenwith.sip
diff --git a/sip/kfile/kfilepreview.sip b/sip/tdefile/tdefilepreview.sip
index 6d2095e..d9301df 100644
--- a/sip/kfile/kfilepreview.sip
+++ b/sip/tdefile/tdefilepreview.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE 3.5.3
+//            module tdefile  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
@@ -27,7 +27,7 @@
 class KFilePreview : TQSplitter, KFileView
 {
 %TypeHeaderCode
-#include <kfilepreview.h>
+#include <tdefilepreview.h>
 %End
 
 
diff --git a/sip/kfile/kfilereader.sip b/sip/tdefile/tdefilereader.sip
index 8f4a5d6..4f78f7b 100644
--- a/sip/kfile/kfilereader.sip
+++ b/sip/tdefile/tdefilereader.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE_3_1_1
+//            module tdefile  version KDE_3_1_1
 
 
 // This software is free software; you can redistribute it and/or
@@ -27,7 +27,7 @@
 class KFileReader : KDirLister
 {
 %TypeHeaderCode
-#include <kfilereader.h>
+#include <tdefilereader.h>
 %End
 
 
diff --git a/sip/kfile/kfilesharedlg.sip b/sip/tdefile/tdefilesharedlg.sip
index b3d78ff..49f3952 100644
--- a/sip/kfile/kfilesharedlg.sip
+++ b/sip/tdefile/tdefilesharedlg.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE 3.5.3
+//            module tdefile  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
@@ -29,7 +29,7 @@
 class KFileSharePropsPlugin : KPropsDlgPlugin
 {
 %TypeHeaderCode
-#include <kfilesharedlg.h>
+#include <tdefilesharedlg.h>
 %End
 
 
diff --git a/sip/kfile/kfiletreebranch.sip b/sip/tdefile/tdefiletreebranch.sip
index 15c9d47..75e7874 100644
--- a/sip/kfile/kfiletreebranch.sip
+++ b/sip/tdefile/tdefiletreebranch.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE 3.5.3
+//            module tdefile  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
@@ -27,7 +27,7 @@
 class KFileTreeBranch : KDirLister
 {
 %TypeHeaderCode
-#include <kfiletreebranch.h>
+#include <tdefiletreebranch.h>
 %End
 
 
@@ -85,7 +85,7 @@ typedef TQPtrList<KFileTreeBranch> KFileTreeBranchList;
 //converts a Python list of KFileTreeViewItem
 {
 %TypeHeaderCode
-#include <kfiletreeviewitem.h>
+#include <tdefiletreeviewitem.h>
 typedef TQPtrList<KFileTreeViewItem> KFileTreeViewItemList;
 %End
 
@@ -160,7 +160,7 @@ typedef TQPtrList<KFileTreeViewItem> KFileTreeViewItemList;
 //converts a Python list of KFileTreeBranch
 {
 %TypeHeaderCode
-#include <kfiletreebranch.h>
+#include <tdefiletreebranch.h>
 //typedef TQPtrList<KFileTreeBranch> KFileTreeBList;
 %End
 
diff --git a/sip/kfile/kfiletreeview.sip b/sip/tdefile/tdefiletreeview.sip
index d89e59a..50296f5 100644
--- a/sip/kfile/kfiletreeview.sip
+++ b/sip/tdefile/tdefiletreeview.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE 3.5.3
+//            module tdefile  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
@@ -27,7 +27,7 @@
 class KFileTreeViewToolTip : TQToolTip
 {
 %TypeHeaderCode
-#include <kfiletreeview.h>
+#include <tdefiletreeview.h>
 %End
 
 
@@ -43,7 +43,7 @@ protected:
 class KFileTreeView : KListView
 {
 %TypeHeaderCode
-#include <kfiletreeview.h>
+#include <tdefiletreeview.h>
 %End
 
 
diff --git a/sip/kfile/kfiletreeviewitem.sip b/sip/tdefile/tdefiletreeviewitem.sip
index 1d52d86..ed330b2 100644
--- a/sip/kfile/kfiletreeviewitem.sip
+++ b/sip/tdefile/tdefiletreeviewitem.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE 3.5.3
+//            module tdefile  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
@@ -27,7 +27,7 @@
 class KFileTreeViewItem : KListViewItem
 {
 %TypeHeaderCode
-#include <kfiletreeviewitem.h>
+#include <tdefiletreeviewitem.h>
 %End
 
 
diff --git a/sip/kfile/kfileview.sip b/sip/tdefile/tdefileview.sip
index b29fe7e..43b935f 100644
--- a/sip/kfile/kfileview.sip
+++ b/sip/tdefile/tdefileview.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE 3.5.3
+//            module tdefile  version KDE 3.5.3
 
 
 // This software is free software; you can redistribute it and/or
@@ -27,7 +27,7 @@
 class KFileViewSignaler : TQObject
 {
 %TypeHeaderCode
-#include <kfileview.h>
+#include <tdefileview.h>
 %End
 
 
@@ -60,7 +60,7 @@ signals:
 class KFileView
 {
 %TypeHeaderCode
-#include <kfileview.h>
+#include <tdefileview.h>
 %End
 
 
diff --git a/sip/kfile/kfileviewitem.sip b/sip/tdefile/tdefileviewitem.sip
index 4193b3a..22119ca 100644
--- a/sip/kfile/kfileviewitem.sip
+++ b/sip/tdefile/tdefileviewitem.sip
@@ -5,7 +5,7 @@
 
 
 //                 Generated by preSip
-//            module kfile  version KDE_3_1_1
+//            module tdefile  version KDE_3_1_1
 
 
 // This software is free software; you can redistribute it and/or
@@ -27,7 +27,7 @@
 class KFileViewItem : KFileItem
 {
 %TypeHeaderCode
-#include <kfileviewitem.h>
+#include <tdefileviewitem.h>
 %End
 
 
diff --git a/sip/tderesources/resource.sip b/sip/tderesources/resource.sip
index 0831a82..972d3a1 100644
--- a/sip/tderesources/resource.sip
+++ b/sip/tderesources/resource.sip
@@ -31,7 +31,7 @@ namespace KRES
 class Resource : TQObject
 {
 %TypeHeaderCode
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <resource.h>
 %End
 
diff --git a/sip/tdespell/tdespellmod.sip.in b/sip/tdespell/tdespellmod.sip.in
index cc6d5c4..95670ca 100644
--- a/sip/tdespell/tdespellmod.sip.in
+++ b/sip/tdespell/tdespellmod.sip.in
@@ -34,7 +34,7 @@
 %Import tdecoremod.sip
 %Import tdefxmod.sip
 %Import tdeuimod.sip
-%Import kfilemod.sip
+%Import tdefilemod.sip
 
 %Include ksconfig.sip
 %Include tdespell.sip
diff --git a/sip/tdeui/kactionshortcutlist.sip b/sip/tdeui/kactionshortcutlist.sip
index 2d5a0d7..22a07a4 100644
--- a/sip/tdeui/kactionshortcutlist.sip
+++ b/sip/tdeui/kactionshortcutlist.sip
@@ -27,7 +27,7 @@
 class KActionShortcutList : KShortcutList
 {
 %TypeHeaderCode
-#include <kconfigbase.h>
+#include <tdeconfigbase.h>
 #include <kshortcut.h>
 #include <kaction.h>
 #include <kactionshortcutlist.h>
@@ -65,7 +65,7 @@ protected:
 class KActionPtrShortcutList : KShortcutList
 {
 %TypeHeaderCode
-#include <kconfigbase.h>
+#include <tdeconfigbase.h>
 #include <kshortcut.h>
 #include <kaction.h>
 #include <kactionshortcutlist.h>
diff --git a/sip/tdeui/kconfigdialog.sip b/sip/tdeui/tdeconfigdialog.sip
index 30a7234..ea5d046 100644
--- a/sip/tdeui/kconfigdialog.sip
+++ b/sip/tdeui/tdeconfigdialog.sip
@@ -29,7 +29,7 @@
 class TDEConfigDialog : KDialogBase
 {
 %TypeHeaderCode
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
 %End
 
 
diff --git a/sip/tdeui/tdeui-kde320.diff b/sip/tdeui/tdeui-kde320.diff
index 2e22393..f1c0755 100644
--- a/sip/tdeui/tdeui-kde320.diff
+++ b/sip/tdeui/tdeui-kde320.diff
@@ -1,6 +1,6 @@
 + %Include kactionclasses.sip
 + %Include kactioncollection.sip
-+ %Include kconfigdialog.sip
++ %Include tdeconfigdialog.sip
 + %Include kdatetimewidget.sip
 + %Include kfontrequester.sip
 + %Include kinputdialog.sip
diff --git a/sip/tdeui/tdeui-kde321.diff b/sip/tdeui/tdeui-kde321.diff
index 2e22393..f1c0755 100644
--- a/sip/tdeui/tdeui-kde321.diff
+++ b/sip/tdeui/tdeui-kde321.diff
@@ -1,6 +1,6 @@
 + %Include kactionclasses.sip
 + %Include kactioncollection.sip
-+ %Include kconfigdialog.sip
++ %Include tdeconfigdialog.sip
 + %Include kdatetimewidget.sip
 + %Include kfontrequester.sip
 + %Include kinputdialog.sip
diff --git a/sip/tdeui/tdeui-kde322.diff b/sip/tdeui/tdeui-kde322.diff
index 2e22393..f1c0755 100644
--- a/sip/tdeui/tdeui-kde322.diff
+++ b/sip/tdeui/tdeui-kde322.diff
@@ -1,6 +1,6 @@
 + %Include kactionclasses.sip
 + %Include kactioncollection.sip
-+ %Include kconfigdialog.sip
++ %Include tdeconfigdialog.sip
 + %Include kdatetimewidget.sip
 + %Include kfontrequester.sip
 + %Include kinputdialog.sip
diff --git a/sip/tdeui/tdeui-kde323.diff b/sip/tdeui/tdeui-kde323.diff
index a5989d4..18841bb 100644
--- a/sip/tdeui/tdeui-kde323.diff
+++ b/sip/tdeui/tdeui-kde323.diff
@@ -1,6 +1,6 @@
 + %Include kactionclasses.sip
 + %Include kactioncollection.sip
-+ %Include kconfigdialog.sip
++ %Include tdeconfigdialog.sip
 + %Include kdatetimewidget.sip
 + %Include kfontrequester.sip
 + %Include kinputdialog.sip
diff --git a/sip/tdeui/tdeui-kde330.diff b/sip/tdeui/tdeui-kde330.diff
index dfe8ea4..0e78196 100644
--- a/sip/tdeui/tdeui-kde330.diff
+++ b/sip/tdeui/tdeui-kde330.diff
@@ -1,7 +1,7 @@
 + %Include kactionclasses.sip
 + %Include kactioncollection.sip
 + %Include kactionselector.sip
-+ %Include kconfigdialog.sip
++ %Include tdeconfigdialog.sip
 + %Include kdatetimewidget.sip
 + %Include kfontrequester.sip
 + %Include kinputdialog.sip
diff --git a/sip/tdeui/tdeui-kde331.diff b/sip/tdeui/tdeui-kde331.diff
index dfe8ea4..0e78196 100644
--- a/sip/tdeui/tdeui-kde331.diff
+++ b/sip/tdeui/tdeui-kde331.diff
@@ -1,7 +1,7 @@
 + %Include kactionclasses.sip
 + %Include kactioncollection.sip
 + %Include kactionselector.sip
-+ %Include kconfigdialog.sip
++ %Include tdeconfigdialog.sip
 + %Include kdatetimewidget.sip
 + %Include kfontrequester.sip
 + %Include kinputdialog.sip
diff --git a/sip/tdeui/tdeui-kde332.diff b/sip/tdeui/tdeui-kde332.diff
index dfe8ea4..0e78196 100644
--- a/sip/tdeui/tdeui-kde332.diff
+++ b/sip/tdeui/tdeui-kde332.diff
@@ -1,7 +1,7 @@
 + %Include kactionclasses.sip
 + %Include kactioncollection.sip
 + %Include kactionselector.sip
-+ %Include kconfigdialog.sip
++ %Include tdeconfigdialog.sip
 + %Include kdatetimewidget.sip
 + %Include kfontrequester.sip
 + %Include kinputdialog.sip
diff --git a/sip/tdeui/tdeui-kde340.diff b/sip/tdeui/tdeui-kde340.diff
index 57d6793..a59386a 100644
--- a/sip/tdeui/tdeui-kde340.diff
+++ b/sip/tdeui/tdeui-kde340.diff
@@ -1,7 +1,7 @@
 + %Include kactionclasses.sip
 + %Include kactioncollection.sip
 + %Include kactionselector.sip
-+ %Include kconfigdialog.sip
++ %Include tdeconfigdialog.sip
 + %Include kdatetimewidget.sip
 + %Include kfontrequester.sip
 + %Include kiconviewsearchline.sip
diff --git a/sip/tdeui/tdeui-kde341.diff b/sip/tdeui/tdeui-kde341.diff
index 57d6793..a59386a 100644
--- a/sip/tdeui/tdeui-kde341.diff
+++ b/sip/tdeui/tdeui-kde341.diff
@@ -1,7 +1,7 @@
 + %Include kactionclasses.sip
 + %Include kactioncollection.sip
 + %Include kactionselector.sip
-+ %Include kconfigdialog.sip
++ %Include tdeconfigdialog.sip
 + %Include kdatetimewidget.sip
 + %Include kfontrequester.sip
 + %Include kiconviewsearchline.sip
diff --git a/sip/tdeui/tdeui-kde342.diff b/sip/tdeui/tdeui-kde342.diff
index 57d6793..a59386a 100644
--- a/sip/tdeui/tdeui-kde342.diff
+++ b/sip/tdeui/tdeui-kde342.diff
@@ -1,7 +1,7 @@
 + %Include kactionclasses.sip
 + %Include kactioncollection.sip
 + %Include kactionselector.sip
-+ %Include kconfigdialog.sip
++ %Include tdeconfigdialog.sip
 + %Include kdatetimewidget.sip
 + %Include kfontrequester.sip
 + %Include kiconviewsearchline.sip
diff --git a/sip/tdeui/tdeui-kde343.diff b/sip/tdeui/tdeui-kde343.diff
index 57d6793..a59386a 100644
--- a/sip/tdeui/tdeui-kde343.diff
+++ b/sip/tdeui/tdeui-kde343.diff
@@ -1,7 +1,7 @@
 + %Include kactionclasses.sip
 + %Include kactioncollection.sip
 + %Include kactionselector.sip
-+ %Include kconfigdialog.sip
++ %Include tdeconfigdialog.sip
 + %Include kdatetimewidget.sip
 + %Include kfontrequester.sip
 + %Include kiconviewsearchline.sip
diff --git a/sip/tdeui/tdeui-kde350.diff b/sip/tdeui/tdeui-kde350.diff
index 381467e..b78a05a 100644
--- a/sip/tdeui/tdeui-kde350.diff
+++ b/sip/tdeui/tdeui-kde350.diff
@@ -1,7 +1,7 @@
 + %Include kactionclasses.sip
 + %Include kactioncollection.sip
 + %Include kactionselector.sip
-+ %Include kconfigdialog.sip
++ %Include tdeconfigdialog.sip
 + %Include kdatetimewidget.sip
 + %Include kfontrequester.sip
 + %Include kiconviewsearchline.sip
diff --git a/sip/tdeui/tdeui-kde351.diff b/sip/tdeui/tdeui-kde351.diff
index 381467e..b78a05a 100644
--- a/sip/tdeui/tdeui-kde351.diff
+++ b/sip/tdeui/tdeui-kde351.diff
@@ -1,7 +1,7 @@
 + %Include kactionclasses.sip
 + %Include kactioncollection.sip
 + %Include kactionselector.sip
-+ %Include kconfigdialog.sip
++ %Include tdeconfigdialog.sip
 + %Include kdatetimewidget.sip
 + %Include kfontrequester.sip
 + %Include kiconviewsearchline.sip
diff --git a/sip/tdeui/tdeui-kde352.diff b/sip/tdeui/tdeui-kde352.diff
index 381467e..b78a05a 100644
--- a/sip/tdeui/tdeui-kde352.diff
+++ b/sip/tdeui/tdeui-kde352.diff
@@ -1,7 +1,7 @@
 + %Include kactionclasses.sip
 + %Include kactioncollection.sip
 + %Include kactionselector.sip
-+ %Include kconfigdialog.sip
++ %Include tdeconfigdialog.sip
 + %Include kdatetimewidget.sip
 + %Include kfontrequester.sip
 + %Include kiconviewsearchline.sip
diff --git a/sip/tdeui/tdeui-kde353.diff b/sip/tdeui/tdeui-kde353.diff
index 381467e..b78a05a 100644
--- a/sip/tdeui/tdeui-kde353.diff
+++ b/sip/tdeui/tdeui-kde353.diff
@@ -1,7 +1,7 @@
 + %Include kactionclasses.sip
 + %Include kactioncollection.sip
 + %Include kactionselector.sip
-+ %Include kconfigdialog.sip
++ %Include tdeconfigdialog.sip
 + %Include kdatetimewidget.sip
 + %Include kfontrequester.sip
 + %Include kiconviewsearchline.sip