diff --git a/ChangeLog.2001-4 b/ChangeLog.2001-4
index 817d92e..289b0d7 100644
--- a/ChangeLog.2001-4
+++ b/ChangeLog.2001-4
@@ -34,7 +34,7 @@ No release; removed circular ref between
 libpykpanelapplet and libtdeuicmodule; adjusted
 kpanelapplet.sip, pykpanelapplet.h and build.py
 to implement; moved nullGUIItem to top of
-kmessagebox.sip; considering removing qxembed.sip
+tdemessagebox.sip; considering removing qxembed.sip
 
 2003/9/1 10:52:00 jim
 No release; Revised handling of global.sip and
diff --git a/Changelog b/Changelog
index 5cc7ad3..0baca47 100644
--- a/Changelog
+++ b/Changelog
@@ -128,17 +128,17 @@ KDE 3.5.1
 ------------------------------------------------------------------------
 r132 | (no author) | 2006-01-27 13:00:18 -0800 (Fri, 27 Jan 2006) | 2 lines
 
-added missing method kabc/resourcefile.sip
+added missing method tdeabc/resourcefile.sip
 
 ------------------------------------------------------------------------
 r131 | (no author) | 2006-01-26 19:27:45 -0800 (Thu, 26 Jan 2006) | 2 lines
 
-fully-qualified names in kabc/resourcefile.sip
+fully-qualified names in tdeabc/resourcefile.sip
 
 ------------------------------------------------------------------------
 r130 | (no author) | 2006-01-26 16:53:44 -0800 (Thu, 26 Jan 2006) | 3 lines
 
-Put kabc/resourcefile.sip back into kabc for later
+Put tdeabc/resourcefile.sip back into kabc for later
 versions (missing in tdelibs tarball, but in trinity/include/kabc)
 
 ------------------------------------------------------------------------
@@ -150,7 +150,7 @@ generated)
 ------------------------------------------------------------------------
 r128 | (no author) | 2006-01-26 16:46:27 -0800 (Thu, 26 Jan 2006) | 2 lines
 
-Updated kabc/resourcefile.sip - versioning
+Updated tdeabc/resourcefile.sip - versioning
 
 ------------------------------------------------------------------------
 r127 | (no author) | 2006-01-23 00:19:15 -0800 (Mon, 23 Jan 2006) | 2 lines
@@ -168,7 +168,7 @@ tdeio/global.sip
 r125 | (no author) | 2006-01-22 21:45:55 -0800 (Sun, 22 Jan 2006) | 8 lines
 
 modify configure.py to drop tderesources for KDE < 3.2;
-version Resource class in kabc/resource.sip; version
+version Resource class in tdeabc/resource.sip; version
 64 bit read/write stuff in tdecore/tdeconfigbase.sip;
 version copy ctor in tdecore/kprocctrl.sip; version
 out longlong/ulonglong mapped types in tdeio/global.sip;
diff --git a/doc/classref/allclasses.html b/doc/classref/allclasses.html
index cee4636..760c9bc 100644
--- a/doc/classref/allclasses.html
+++ b/doc/classref/allclasses.html
@@ -147,66 +147,66 @@
 <tr ><td><a href="tdehtml/DOM.UIEvent.html">DOM.UIEvent</A></td></tr>
 <tr ><td><a href="tdehtml/DOM.html">DOM</A></td></tr>
 <tr ><td><a href="tdeparts/ExtTerminalInterface.html"><i>ExtTerminalInterface</i></A></td></tr>
-<tr ><td><a href="kabc/KABC.Address.html">KABC.Address</A></td></tr>
-<tr ><td><a href="kabc/KABC.AddressBook.html">KABC.AddressBook</A></td></tr>
-<tr ><td><a href="kabc/KABC.AddressLineEdit.html">KABC.AddressLineEdit</A></td></tr>
-<tr ><td><a href="kabc/KABC.AddresseeDialog.html">KABC.AddresseeDialog</A></td></tr>
-<tr ><td><a href="kabc/KABC.AddresseeItem.html">KABC.AddresseeItem</A></td></tr>
-<tr ><td><a href="kabc/KABC.Agent.html">KABC.Agent</A></td></tr>
-<tr ><td><a href="kabc/KABC.ConsoleErrorHandler.html">KABC.ConsoleErrorHandler</A></td></tr>
-<tr ><td><a href="kabc/KABC.DistributionList.Entry.html">KABC.DistributionList.Entry</A></td></tr>
-<tr ><td><a href="kabc/KABC.DistributionList.html">KABC.DistributionList</A></td></tr>
-<tr ><td><a href="kabc/KABC.DistributionListDialog.html">KABC.DistributionListDialog</A></td></tr>
-<tr ><td><a href="kabc/KABC.DistributionListEditorWidget.html">KABC.DistributionListEditorWidget</A></td></tr>
-<tr ><td><a href="kabc/KABC.DistributionListManager.html">KABC.DistributionListManager</A></td></tr>
-<tr ><td><a href="kabc/KABC.DistributionListWatcher.html">KABC.DistributionListWatcher</A></td></tr>
-<tr ><td><a href="kabc/KABC.EmailSelectDialog.html">KABC.EmailSelectDialog</A></td></tr>
-<tr ><td><a href="kabc/KABC.EmailSelector.html">KABC.EmailSelector</A></td></tr>
-<tr ><td><a href="kabc/KABC.ErrorHandler.html"><i>KABC.ErrorHandler</i></A></td></tr>
-<tr ><td><a href="kabc/KABC.Field.html">KABC.Field</A></td></tr>
-<tr ><td><a href="kabc/KABC.FieldSortMode.html">KABC.FieldSortMode</A></td></tr>
-<tr ><td><a href="kabc/KABC.Format.html"><i>KABC.Format</i></A></td></tr>
-<tr ><td><a href="kabc/KABC.FormatFactory.html">KABC.FormatFactory</A></td></tr>
-<tr ><td><a href="kabc/KABC.FormatInfo.html">KABC.FormatInfo</A></td></tr>
-<tr ><td><a href="kabc/KABC.FormatPlugin.html"><i>KABC.FormatPlugin</i></A></td></tr>
-<tr ><td><a href="kabc/KABC.GUIErrorHandler.html">KABC.GUIErrorHandler</A></td></tr>
-<tr ><td><a href="kabc/KABC.Geo.html">KABC.Geo</A></td></tr>
-<tr ><td><a href="kabc/KABC.GuiErrorHandler.html">KABC.GuiErrorHandler</A></td></tr>
-<tr ><td><a href="kabc/KABC.Key.html">KABC.Key</A></td></tr>
-<tr ><td><a href="kabc/KABC.LDAPUrl.Extension.html">KABC.LDAPUrl.Extension</A></td></tr>
-<tr ><td><a href="kabc/KABC.LDAPUrl.html">KABC.LDAPUrl</A></td></tr>
-<tr ><td><a href="kabc/KABC.LDIF.html">KABC.LDIF</A></td></tr>
-<tr ><td><a href="kabc/KABC.LDIFConverter.html">KABC.LDIFConverter</A></td></tr>
-<tr ><td><a href="kabc/KABC.LdapClient.html">KABC.LdapClient</A></td></tr>
-<tr ><td><a href="kabc/KABC.LdapConfigWidget.html">KABC.LdapConfigWidget</A></td></tr>
-<tr ><td><a href="kabc/KABC.LdapObject.html">KABC.LdapObject</A></td></tr>
-<tr ><td><a href="kabc/KABC.LdapResult.html">KABC.LdapResult</A></td></tr>
-<tr ><td><a href="kabc/KABC.LdapSearch.html">KABC.LdapSearch</A></td></tr>
-<tr ><td><a href="kabc/KABC.Lock.html">KABC.Lock</A></td></tr>
-<tr ><td><a href="kabc/KABC.LockNull.html">KABC.LockNull</A></td></tr>
-<tr ><td><a href="kabc/KABC.NameSortMode.html">KABC.NameSortMode</A></td></tr>
-<tr ><td><a href="kabc/KABC.PhoneNumber.html">KABC.PhoneNumber</A></td></tr>
-<tr ><td><a href="kabc/KABC.Picture.html">KABC.Picture</A></td></tr>
-<tr ><td><a href="kabc/KABC.Plugin.html">KABC.Plugin</A></td></tr>
-<tr ><td><a href="kabc/KABC.Resource.html">KABC.Resource</A></td></tr>
-<tr ><td><a href="kabc/KABC.ResourceFile.html">KABC.ResourceFile</A></td></tr>
-<tr ><td><a href="kabc/KABC.ResourceSelectDialog.html">KABC.ResourceSelectDialog</A></td></tr>
-<tr ><td><a href="kabc/KABC.Secrecy.html">KABC.Secrecy</A></td></tr>
-<tr ><td><a href="kabc/KABC.SortMode.html"><i>KABC.SortMode</i></A></td></tr>
-<tr ><td><a href="kabc/KABC.SortingTraits.FamilyName.html">KABC.SortingTraits.FamilyName</A></td></tr>
-<tr ><td><a href="kabc/KABC.SortingTraits.FormattedName.html">KABC.SortingTraits.FormattedName</A></td></tr>
-<tr ><td><a href="kabc/KABC.SortingTraits.GivenName.html">KABC.SortingTraits.GivenName</A></td></tr>
-<tr ><td><a href="kabc/KABC.SortingTraits.Name.html">KABC.SortingTraits.Name</A></td></tr>
-<tr ><td><a href="kabc/KABC.SortingTraits.Uid.html">KABC.SortingTraits.Uid</A></td></tr>
-<tr ><td><a href="kabc/KABC.SortingTraits.html">KABC.SortingTraits</A></td></tr>
-<tr ><td><a href="kabc/KABC.Sound.html">KABC.Sound</A></td></tr>
-<tr ><td><a href="kabc/KABC.StdAddressBook.html">KABC.StdAddressBook</A></td></tr>
-<tr ><td><a href="kabc/KABC.Ticket.html">KABC.Ticket</A></td></tr>
-<tr ><td><a href="kabc/KABC.TimeZone.html">KABC.TimeZone</A></td></tr>
-<tr ><td><a href="kabc/KABC.VCardConverter.html">KABC.VCardConverter</A></td></tr>
-<tr ><td><a href="kabc/KABC.VCardFormat.html">KABC.VCardFormat</A></td></tr>
-<tr ><td><a href="kabc/KABC.VCardFormatPlugin.html">KABC.VCardFormatPlugin</A></td></tr>
-<tr ><td><a href="kabc/KABC.html">KABC</A></td></tr>
+<tr ><td><a href="tdeabc/KABC.Address.html">KABC.Address</A></td></tr>
+<tr ><td><a href="tdeabc/KABC.AddressBook.html">KABC.AddressBook</A></td></tr>
+<tr ><td><a href="tdeabc/KABC.AddressLineEdit.html">KABC.AddressLineEdit</A></td></tr>
+<tr ><td><a href="tdeabc/KABC.AddresseeDialog.html">KABC.AddresseeDialog</A></td></tr>
+<tr ><td><a href="tdeabc/KABC.AddresseeItem.html">KABC.AddresseeItem</A></td></tr>
+<tr ><td><a href="tdeabc/KABC.Agent.html">KABC.Agent</A></td></tr>
+<tr ><td><a href="tdeabc/KABC.ConsoleErrorHandler.html">KABC.ConsoleErrorHandler</A></td></tr>
+<tr ><td><a href="tdeabc/KABC.DistributionList.Entry.html">KABC.DistributionList.Entry</A></td></tr>
+<tr ><td><a href="tdeabc/KABC.DistributionList.html">KABC.DistributionList</A></td></tr>
+<tr ><td><a href="tdeabc/KABC.DistributionListDialog.html">KABC.DistributionListDialog</A></td></tr>
+<tr ><td><a href="tdeabc/KABC.DistributionListEditorWidget.html">KABC.DistributionListEditorWidget</A></td></tr>
+<tr ><td><a href="tdeabc/KABC.DistributionListManager.html">KABC.DistributionListManager</A></td></tr>
+<tr ><td><a href="tdeabc/KABC.DistributionListWatcher.html">KABC.DistributionListWatcher</A></td></tr>
+<tr ><td><a href="tdeabc/KABC.EmailSelectDialog.html">KABC.EmailSelectDialog</A></td></tr>
+<tr ><td><a href="tdeabc/KABC.EmailSelector.html">KABC.EmailSelector</A></td></tr>
+<tr ><td><a href="tdeabc/KABC.ErrorHandler.html"><i>KABC.ErrorHandler</i></A></td></tr>
+<tr ><td><a href="tdeabc/KABC.Field.html">KABC.Field</A></td></tr>
+<tr ><td><a href="tdeabc/KABC.FieldSortMode.html">KABC.FieldSortMode</A></td></tr>
+<tr ><td><a href="tdeabc/KABC.Format.html"><i>KABC.Format</i></A></td></tr>
+<tr ><td><a href="tdeabc/KABC.FormatFactory.html">KABC.FormatFactory</A></td></tr>
+<tr ><td><a href="tdeabc/KABC.FormatInfo.html">KABC.FormatInfo</A></td></tr>
+<tr ><td><a href="tdeabc/KABC.FormatPlugin.html"><i>KABC.FormatPlugin</i></A></td></tr>
+<tr ><td><a href="tdeabc/KABC.GUIErrorHandler.html">KABC.GUIErrorHandler</A></td></tr>
+<tr ><td><a href="tdeabc/KABC.Geo.html">KABC.Geo</A></td></tr>
+<tr ><td><a href="tdeabc/KABC.GuiErrorHandler.html">KABC.GuiErrorHandler</A></td></tr>
+<tr ><td><a href="tdeabc/KABC.Key.html">KABC.Key</A></td></tr>
+<tr ><td><a href="tdeabc/KABC.LDAPUrl.Extension.html">KABC.LDAPUrl.Extension</A></td></tr>
+<tr ><td><a href="tdeabc/KABC.LDAPUrl.html">KABC.LDAPUrl</A></td></tr>
+<tr ><td><a href="tdeabc/KABC.LDIF.html">KABC.LDIF</A></td></tr>
+<tr ><td><a href="tdeabc/KABC.LDIFConverter.html">KABC.LDIFConverter</A></td></tr>
+<tr ><td><a href="tdeabc/KABC.LdapClient.html">KABC.LdapClient</A></td></tr>
+<tr ><td><a href="tdeabc/KABC.LdapConfigWidget.html">KABC.LdapConfigWidget</A></td></tr>
+<tr ><td><a href="tdeabc/KABC.LdapObject.html">KABC.LdapObject</A></td></tr>
+<tr ><td><a href="tdeabc/KABC.LdapResult.html">KABC.LdapResult</A></td></tr>
+<tr ><td><a href="tdeabc/KABC.LdapSearch.html">KABC.LdapSearch</A></td></tr>
+<tr ><td><a href="tdeabc/KABC.Lock.html">KABC.Lock</A></td></tr>
+<tr ><td><a href="tdeabc/KABC.LockNull.html">KABC.LockNull</A></td></tr>
+<tr ><td><a href="tdeabc/KABC.NameSortMode.html">KABC.NameSortMode</A></td></tr>
+<tr ><td><a href="tdeabc/KABC.PhoneNumber.html">KABC.PhoneNumber</A></td></tr>
+<tr ><td><a href="tdeabc/KABC.Picture.html">KABC.Picture</A></td></tr>
+<tr ><td><a href="tdeabc/KABC.Plugin.html">KABC.Plugin</A></td></tr>
+<tr ><td><a href="tdeabc/KABC.Resource.html">KABC.Resource</A></td></tr>
+<tr ><td><a href="tdeabc/KABC.ResourceFile.html">KABC.ResourceFile</A></td></tr>
+<tr ><td><a href="tdeabc/KABC.ResourceSelectDialog.html">KABC.ResourceSelectDialog</A></td></tr>
+<tr ><td><a href="tdeabc/KABC.Secrecy.html">KABC.Secrecy</A></td></tr>
+<tr ><td><a href="tdeabc/KABC.SortMode.html"><i>KABC.SortMode</i></A></td></tr>
+<tr ><td><a href="tdeabc/KABC.SortingTraits.FamilyName.html">KABC.SortingTraits.FamilyName</A></td></tr>
+<tr ><td><a href="tdeabc/KABC.SortingTraits.FormattedName.html">KABC.SortingTraits.FormattedName</A></td></tr>
+<tr ><td><a href="tdeabc/KABC.SortingTraits.GivenName.html">KABC.SortingTraits.GivenName</A></td></tr>
+<tr ><td><a href="tdeabc/KABC.SortingTraits.Name.html">KABC.SortingTraits.Name</A></td></tr>
+<tr ><td><a href="tdeabc/KABC.SortingTraits.Uid.html">KABC.SortingTraits.Uid</A></td></tr>
+<tr ><td><a href="tdeabc/KABC.SortingTraits.html">KABC.SortingTraits</A></td></tr>
+<tr ><td><a href="tdeabc/KABC.Sound.html">KABC.Sound</A></td></tr>
+<tr ><td><a href="tdeabc/KABC.StdAddressBook.html">KABC.StdAddressBook</A></td></tr>
+<tr ><td><a href="tdeabc/KABC.Ticket.html">KABC.Ticket</A></td></tr>
+<tr ><td><a href="tdeabc/KABC.TimeZone.html">KABC.TimeZone</A></td></tr>
+<tr ><td><a href="tdeabc/KABC.VCardConverter.html">KABC.VCardConverter</A></td></tr>
+<tr ><td><a href="tdeabc/KABC.VCardFormat.html">KABC.VCardFormat</A></td></tr>
+<tr ><td><a href="tdeabc/KABC.VCardFormatPlugin.html">KABC.VCardFormatPlugin</A></td></tr>
+<tr ><td><a href="tdeabc/KABC.html">KABC</A></td></tr>
 <tr ><td><a href="tdeio/KACL.html">KACL</A></td></tr>
 <tr ><td><a href="tdeui/TDEAboutApplication.html">TDEAboutApplication</A></td></tr>
 <tr ><td><a href="tdeui/TDEAboutContainer.html">TDEAboutContainer</A></td></tr>
diff --git a/doc/classref/index.html b/doc/classref/index.html
index 7b4fbae..3b905f5 100644
--- a/doc/classref/index.html
+++ b/doc/classref/index.html
@@ -22,7 +22,7 @@
         <tr bgcolor="#F0F0FF">
         <td><ul>
 <li><a href="dcop/index.html">dcop</a></li>
-<li><a href="kabc/index.html">kabc</a></li>
+<li><a href="tdeabc/index.html">kabc</a></li>
 <li><a href="tdecore/index.html">tdecore</a></li>
 <li><a href="tdefx/index.html">tdefx</a></li>
 <li><a href="tdeprint/index.html">tdeprint</a></li>
diff --git a/doc/classref/kabc/index.html b/doc/classref/kabc/index.html
index 4091822..d5dd3f2 100644
--- a/doc/classref/kabc/index.html
+++ b/doc/classref/kabc/index.html
@@ -22,7 +22,7 @@
                 </table>
             </td>
         </tr></table>
-        <a href = "kabc-globals.html">kabc Global and Namespace members</a><p></p>
+        <a href = "tdeabc-globals.html">kabc Global and Namespace members</a><p></p>
 <table width="100%" border="0"><tr>
 <td valign="top"><table border="0">
 <tr bgcolor="#fff0ff"><th>KABC - KABC.Format</th></tr>
diff --git a/extra/kde300/tdetoolbarbutton.h b/extra/kde300/tdetoolbarbutton.h
index 94d87cc..b2c1440 100644
--- a/extra/kde300/tdetoolbarbutton.h
+++ b/extra/kde300/tdetoolbarbutton.h
@@ -28,7 +28,7 @@
 #include <tqtoolbutton.h>
 #include <tqintdict.h>
 #include <tqstring.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 class TDEToolBar;
 class TDEToolBarButtonPrivate;
diff --git a/extra/kde301/tdetoolbarbutton.h b/extra/kde301/tdetoolbarbutton.h
index bdf8bb0..8cc171b 100644
--- a/extra/kde301/tdetoolbarbutton.h
+++ b/extra/kde301/tdetoolbarbutton.h
@@ -28,7 +28,7 @@
 #include <tqtoolbutton.h>
 #include <tqintdict.h>
 #include <tqstring.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 class TDEToolBar;
 class TDEToolBarButtonPrivate;
diff --git a/extra/kde303/tdetoolbarbutton.h b/extra/kde303/tdetoolbarbutton.h
index 4ac8947..bcdf102 100644
--- a/extra/kde303/tdetoolbarbutton.h
+++ b/extra/kde303/tdetoolbarbutton.h
@@ -28,7 +28,7 @@
 #include <tqtoolbutton.h>
 #include <tqintdict.h>
 #include <tqstring.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 class TDEToolBar;
 class TDEToolBarButtonPrivate;
diff --git a/extra/kde310/tdetoolbarbutton.h b/extra/kde310/tdetoolbarbutton.h
index bea5bbe..9db33a5 100644
--- a/extra/kde310/tdetoolbarbutton.h
+++ b/extra/kde310/tdetoolbarbutton.h
@@ -28,7 +28,7 @@
 #include <tqtoolbutton.h>
 #include <tqintdict.h>
 #include <tqstring.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 class TDEToolBar;
 class TDEToolBarButtonPrivate;
diff --git a/extra/kde311/tdetoolbarbutton.h b/extra/kde311/tdetoolbarbutton.h
index bea5bbe..9db33a5 100644
--- a/extra/kde311/tdetoolbarbutton.h
+++ b/extra/kde311/tdetoolbarbutton.h
@@ -28,7 +28,7 @@
 #include <tqtoolbutton.h>
 #include <tqintdict.h>
 #include <tqstring.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 class TDEToolBar;
 class TDEToolBarButtonPrivate;
diff --git a/extra/kde312/tdetoolbarbutton.h b/extra/kde312/tdetoolbarbutton.h
index bea5bbe..9db33a5 100644
--- a/extra/kde312/tdetoolbarbutton.h
+++ b/extra/kde312/tdetoolbarbutton.h
@@ -28,7 +28,7 @@
 #include <tqtoolbutton.h>
 #include <tqintdict.h>
 #include <tqstring.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 class TDEToolBar;
 class TDEToolBarButtonPrivate;
diff --git a/extra/kde313/tdetoolbarbutton.h b/extra/kde313/tdetoolbarbutton.h
index bea5bbe..9db33a5 100644
--- a/extra/kde313/tdetoolbarbutton.h
+++ b/extra/kde313/tdetoolbarbutton.h
@@ -28,7 +28,7 @@
 #include <tqtoolbutton.h>
 #include <tqintdict.h>
 #include <tqstring.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 class TDEToolBar;
 class TDEToolBarButtonPrivate;
diff --git a/extra/kde314/tdetoolbarbutton.h b/extra/kde314/tdetoolbarbutton.h
index bea5bbe..9db33a5 100644
--- a/extra/kde314/tdetoolbarbutton.h
+++ b/extra/kde314/tdetoolbarbutton.h
@@ -28,7 +28,7 @@
 #include <tqtoolbutton.h>
 #include <tqintdict.h>
 #include <tqstring.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 class TDEToolBar;
 class TDEToolBarButtonPrivate;
diff --git a/extra/kde315/tdetoolbarbutton.h b/extra/kde315/tdetoolbarbutton.h
index bea5bbe..9db33a5 100644
--- a/extra/kde315/tdetoolbarbutton.h
+++ b/extra/kde315/tdetoolbarbutton.h
@@ -28,7 +28,7 @@
 #include <tqtoolbutton.h>
 #include <tqintdict.h>
 #include <tqstring.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 class TDEToolBar;
 class TDEToolBarButtonPrivate;
diff --git a/extra/kde320/tdetoolbarbutton.h b/extra/kde320/tdetoolbarbutton.h
index 6201d1d..abff7d6 100644
--- a/extra/kde320/tdetoolbarbutton.h
+++ b/extra/kde320/tdetoolbarbutton.h
@@ -28,7 +28,7 @@
 #include <tqtoolbutton.h>
 #include <tqintdict.h>
 #include <tqstring.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 class TDEToolBar;
 class TDEToolBarButtonPrivate;
diff --git a/extra/kde321/tdetoolbarbutton.h b/extra/kde321/tdetoolbarbutton.h
index 6201d1d..abff7d6 100644
--- a/extra/kde321/tdetoolbarbutton.h
+++ b/extra/kde321/tdetoolbarbutton.h
@@ -28,7 +28,7 @@
 #include <tqtoolbutton.h>
 #include <tqintdict.h>
 #include <tqstring.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 class TDEToolBar;
 class TDEToolBarButtonPrivate;
diff --git a/extra/kde322/tdetoolbarbutton.h b/extra/kde322/tdetoolbarbutton.h
index 6201d1d..abff7d6 100644
--- a/extra/kde322/tdetoolbarbutton.h
+++ b/extra/kde322/tdetoolbarbutton.h
@@ -28,7 +28,7 @@
 #include <tqtoolbutton.h>
 #include <tqintdict.h>
 #include <tqstring.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 class TDEToolBar;
 class TDEToolBarButtonPrivate;
diff --git a/extra/kde323/tdetoolbarbutton.h b/extra/kde323/tdetoolbarbutton.h
index 6201d1d..abff7d6 100644
--- a/extra/kde323/tdetoolbarbutton.h
+++ b/extra/kde323/tdetoolbarbutton.h
@@ -28,7 +28,7 @@
 #include <tqtoolbutton.h>
 #include <tqintdict.h>
 #include <tqstring.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 class TDEToolBar;
 class TDEToolBarButtonPrivate;
diff --git a/extra/kde330/tdetoolbarbutton.h b/extra/kde330/tdetoolbarbutton.h
index 27936a8..a75f545 100644
--- a/extra/kde330/tdetoolbarbutton.h
+++ b/extra/kde330/tdetoolbarbutton.h
@@ -27,7 +27,7 @@
 #include <tqtoolbutton.h>
 #include <tqintdict.h>
 #include <tqstring.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 class TDEToolBar;
 class TDEToolBarButtonPrivate;
diff --git a/extra/kde331/tdetoolbarbutton.h b/extra/kde331/tdetoolbarbutton.h
index 27936a8..a75f545 100644
--- a/extra/kde331/tdetoolbarbutton.h
+++ b/extra/kde331/tdetoolbarbutton.h
@@ -27,7 +27,7 @@
 #include <tqtoolbutton.h>
 #include <tqintdict.h>
 #include <tqstring.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 class TDEToolBar;
 class TDEToolBarButtonPrivate;
diff --git a/extra/kde332/tdetoolbarbutton.h b/extra/kde332/tdetoolbarbutton.h
index 27936a8..a75f545 100644
--- a/extra/kde332/tdetoolbarbutton.h
+++ b/extra/kde332/tdetoolbarbutton.h
@@ -27,7 +27,7 @@
 #include <tqtoolbutton.h>
 #include <tqintdict.h>
 #include <tqstring.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 class TDEToolBar;
 class TDEToolBarButtonPrivate;
diff --git a/extra/kde340/tdetoolbarbutton.h b/extra/kde340/tdetoolbarbutton.h
index 1b35a81..d9b84f7 100644
--- a/extra/kde340/tdetoolbarbutton.h
+++ b/extra/kde340/tdetoolbarbutton.h
@@ -27,7 +27,7 @@
 #include <tqtoolbutton.h>
 #include <tqintdict.h>
 #include <tqstring.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 class TDEToolBar;
 class TDEToolBarButtonPrivate;
diff --git a/extra/kde341/tdetoolbarbutton.h b/extra/kde341/tdetoolbarbutton.h
index 1b35a81..d9b84f7 100644
--- a/extra/kde341/tdetoolbarbutton.h
+++ b/extra/kde341/tdetoolbarbutton.h
@@ -27,7 +27,7 @@
 #include <tqtoolbutton.h>
 #include <tqintdict.h>
 #include <tqstring.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 class TDEToolBar;
 class TDEToolBarButtonPrivate;
diff --git a/extra/kde342/tdetoolbarbutton.h b/extra/kde342/tdetoolbarbutton.h
index 8da921f..2a249c2 100644
--- a/extra/kde342/tdetoolbarbutton.h
+++ b/extra/kde342/tdetoolbarbutton.h
@@ -27,7 +27,7 @@
 #include <tqtoolbutton.h>
 #include <tqintdict.h>
 #include <tqstring.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 class TDEToolBar;
 class TDEToolBarButtonPrivate;
diff --git a/extra/kde343/tdetoolbarbutton.h b/extra/kde343/tdetoolbarbutton.h
index 8da921f..2a249c2 100644
--- a/extra/kde343/tdetoolbarbutton.h
+++ b/extra/kde343/tdetoolbarbutton.h
@@ -27,7 +27,7 @@
 #include <tqtoolbutton.h>
 #include <tqintdict.h>
 #include <tqstring.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 class TDEToolBar;
 class TDEToolBarButtonPrivate;
diff --git a/extra/kde350/tdetoolbarbutton.h b/extra/kde350/tdetoolbarbutton.h
index 6d5cd72..640a849 100644
--- a/extra/kde350/tdetoolbarbutton.h
+++ b/extra/kde350/tdetoolbarbutton.h
@@ -27,7 +27,7 @@
 #include <tqtoolbutton.h>
 #include <tqintdict.h>
 #include <tqstring.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 class TDEToolBar;
 class TDEToolBarButtonPrivate;
diff --git a/extra/kde351/tdetoolbarbutton.h b/extra/kde351/tdetoolbarbutton.h
index 6d5cd72..640a849 100644
--- a/extra/kde351/tdetoolbarbutton.h
+++ b/extra/kde351/tdetoolbarbutton.h
@@ -27,7 +27,7 @@
 #include <tqtoolbutton.h>
 #include <tqintdict.h>
 #include <tqstring.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 class TDEToolBar;
 class TDEToolBarButtonPrivate;
diff --git a/extra/kde352/tdetoolbarbutton.h b/extra/kde352/tdetoolbarbutton.h
index 6d5cd72..640a849 100644
--- a/extra/kde352/tdetoolbarbutton.h
+++ b/extra/kde352/tdetoolbarbutton.h
@@ -27,7 +27,7 @@
 #include <tqtoolbutton.h>
 #include <tqintdict.h>
 #include <tqstring.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 class TDEToolBar;
 class TDEToolBarButtonPrivate;
diff --git a/extra/kde353/tdetoolbarbutton.h b/extra/kde353/tdetoolbarbutton.h
index 6d5cd72..640a849 100644
--- a/extra/kde353/tdetoolbarbutton.h
+++ b/extra/kde353/tdetoolbarbutton.h
@@ -27,7 +27,7 @@
 #include <tqtoolbutton.h>
 #include <tqintdict.h>
 #include <tqstring.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 class TDEToolBar;
 class TDEToolBarButtonPrivate;
diff --git a/pytde351.prj b/pytde351.prj
index b48db80..96395c5 100644
--- a/pytde351.prj
+++ b/pytde351.prj
@@ -221,7 +221,7 @@ retain
 
 module = kabc
 
-source     = $SRC/kabc $SRC/kabc/plugins/file
+source     = $SRC/kabc $SRC/tdeabc/plugins/file
 ignore     =
 compare    = $COMP $COMP/kabc
 subst      =
diff --git a/pytde352.prj b/pytde352.prj
index 5af7193..1463c79 100644
--- a/pytde352.prj
+++ b/pytde352.prj
@@ -221,7 +221,7 @@ retain
 
 module = kabc
 
-source     = $SRC/kabc $SRC/kabc/plugins/file
+source     = $SRC/kabc $SRC/tdeabc/plugins/file
 ignore     =
 compare    = $COMP $COMP/kabc
 subst      =
diff --git a/pytde353.prj b/pytde353.prj
index 098a032..2f4f344 100644
--- a/pytde353.prj
+++ b/pytde353.prj
@@ -221,7 +221,7 @@ retain
 
 module = kabc
 
-source     = $SRC/kabc $SRC/kabc/plugins/file
+source     = $SRC/kabc $SRC/tdeabc/plugins/file
 ignore     =
 compare    = $COMP $COMP/kabc
 subst      =
diff --git a/sip/kabc/resource.sip b/sip/kabc/resource.sip
index 1218fa0..f5ed27b 100644
--- a/sip/kabc/resource.sip
+++ b/sip/kabc/resource.sip
@@ -29,7 +29,7 @@ namespace KABC
 class Ticket
 {
 %TypeHeaderCode
-#include <kabc/resource.h>
+#include <tdeabc/resource.h>
 %End
 
 
@@ -47,7 +47,7 @@ private:
 class Resource : KRES::Resource
 {
 %TypeHeaderCode
-#include <kabc/resource.h>
+#include <tdeabc/resource.h>
 %End
 
 
@@ -99,7 +99,7 @@ protected:
 class Resource : KABC::Plugin
 {
 %TypeHeaderCode
-#include <kabc/resource.h>
+#include <tdeabc/resource.h>
 %End
 
 
@@ -135,7 +135,7 @@ protected:
 class Resource
 {
 %TypeHeaderCode
-#include <kabc/resource.h>
+#include <tdeabc/resource.h>
 %End
 
 
diff --git a/sip/kabc/resourceselectdialog.sip b/sip/kabc/resourceselectdialog.sip
index 56f8d73..d7c0a64 100644
--- a/sip/kabc/resourceselectdialog.sip
+++ b/sip/kabc/resourceselectdialog.sip
@@ -33,7 +33,7 @@ class ResourceSelectDialog
 %TypeHeaderCode
 #include <tqwidget.h>
 #include <resourceselectdialog.h>
-#include <kabc/resource.h>
+#include <tdeabc/resource.h>
 %End
 
 
diff --git a/sip/kabc/stdaddressbook.sip b/sip/kabc/stdaddressbook.sip
index 4de04df..e2e9109 100644
--- a/sip/kabc/stdaddressbook.sip
+++ b/sip/kabc/stdaddressbook.sip
@@ -29,7 +29,7 @@ namespace KABC
 class StdAddressBook : KABC::AddressBook
 {
 %TypeHeaderCode
-#include <kabc/resource.h>
+#include <tdeabc/resource.h>
 #include <addressee.h>
 #include <addressbook.h>
 #include <stdaddressbook.h>
diff --git a/sip/tdecore/kglobal.sip b/sip/tdecore/kglobal.sip
index 645ca68..948bb9d 100644
--- a/sip/tdecore/kglobal.sip
+++ b/sip/tdecore/kglobal.sip
@@ -27,7 +27,7 @@
 class TDEGlobal
 {
 %TypeHeaderCode
-#include <kglobal.h>
+#include <tdeglobal.h>
 %End
 
 
diff --git a/sip/tdecore/kglobalsettings.sip b/sip/tdecore/kglobalsettings.sip
index 8140043..7763820 100644
--- a/sip/tdecore/kglobalsettings.sip
+++ b/sip/tdecore/kglobalsettings.sip
@@ -27,7 +27,7 @@
 class TDEGlobalSettings
 {
 %TypeHeaderCode
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 %End
 
 
diff --git a/sip/tdecore/klocale.sip b/sip/tdecore/klocale.sip
index e1a17bc..ee5367b 100644
--- a/sip/tdecore/klocale.sip
+++ b/sip/tdecore/klocale.sip
@@ -27,7 +27,7 @@
 class TDELocale
 {
 %TypeHeaderCode
-#include <klocale.h>
+#include <tdelocale.h>
 %End
 
 
@@ -235,7 +235,7 @@ private:
 
 
 %ModuleCode
-#include <klocale.h>
+#include <tdelocale.h>
 %End
 
 TQString              i18n (const char*);
diff --git a/sip/tdecore/kstartupinfo.sip b/sip/tdecore/kstartupinfo.sip
index 53dfa03..95e6e16 100644
--- a/sip/tdecore/kstartupinfo.sip
+++ b/sip/tdecore/kstartupinfo.sip
@@ -27,7 +27,7 @@
 class TDEStartupInfo : TQObject
 {
 %TypeHeaderCode
-#include <kstartupinfo.h>
+#include <tdestartupinfo.h>
 %End
 
 
@@ -108,7 +108,7 @@ protected:
 class TDEStartupInfoId
 {
 %TypeHeaderCode
-#include <kstartupinfo.h>
+#include <tdestartupinfo.h>
 %End
 
 
@@ -145,7 +145,7 @@ private:
 class TDEStartupInfoData
 {
 %TypeHeaderCode
-#include <kstartupinfo.h>
+#include <tdestartupinfo.h>
 %End
 
 
diff --git a/sip/tdecore/ktempfile.sip b/sip/tdecore/ktempfile.sip
index 93aba49..3e5efc2 100644
--- a/sip/tdecore/ktempfile.sip
+++ b/sip/tdecore/ktempfile.sip
@@ -27,7 +27,7 @@
 class KTempFile
 {
 %TypeHeaderCode
-#include <ktempfile.h>
+#include <tdetempfile.h>
 %End
 
 
diff --git a/sip/tdecore/tdecoremod.sip.in b/sip/tdecore/tdecoremod.sip.in
index 796dbc9..01f1fde 100644
--- a/sip/tdecore/tdecoremod.sip.in
+++ b/sip/tdecore/tdecoremod.sip.in
@@ -52,9 +52,9 @@
 %Include kcrash.sip
 %Include kdcoppropertyproxy.sip
 %Include kdesktopfile.sip
-%Include kglobal.sip
+%Include tdeglobal.sip
 %Include kglobalaccel.sip
-%Include kglobalsettings.sip
+%Include tdeglobalsettings.sip
 %Include kiconeffect.sip
 %Include kiconloader.sip
 %Include kicontheme.sip
@@ -63,7 +63,7 @@
 %Include kkeynative.sip
 %Include kkeyserver_x11.sip
 %Include klibloader.sip
-%Include klocale.sip
+%Include tdelocale.sip
 %Include kmdcodec.sip
 %Include kmimesourcefactory.sip
 %Include tdemultipledrag.sip
@@ -83,13 +83,13 @@
 %Include tdeshortcutlist.sip
 %Include ksimpleconfig.sip
 %Include ksock.sip
-%Include kstartupinfo.sip
+%Include tdestartupinfo.sip
 %Include kstaticdeleter.sip
 %Include tdestdaccel.sip
 %Include kstddirs.sip
 %Include kstringhandler.sip
 %Include ktempdir.sip
-%Include ktempfile.sip
+%Include tdetempfile.sip
 %Include kuniqueapplication.sip
 %Include kurl.sip
 %Include twin.sip
diff --git a/sip/tdefile/kdiroperator.sip b/sip/tdefile/kdiroperator.sip
index 225a53d..88dde85 100644
--- a/sip/tdefile/kdiroperator.sip
+++ b/sip/tdefile/kdiroperator.sip
@@ -27,7 +27,7 @@
 class KDirOperator : TQWidget
 {
 %TypeHeaderCode
-#include <kdiroperator.h>
+#include <tdediroperator.h>
 %End
 
 
diff --git a/sip/tdefile/tdefilemod.sip.in b/sip/tdefile/tdefilemod.sip.in
index 158dfbf..a07b0f3 100644
--- a/sip/tdefile/tdefilemod.sip.in
+++ b/sip/tdefile/tdefilemod.sip.in
@@ -37,7 +37,7 @@
 %Import tdeiomod.sip
 
 %Include kcombiview.sip
-%Include kdiroperator.sip
+%Include tdediroperator.sip
 %Include kdirselectdialog.sip
 %Include kdirsize.sip
 %Include tdefile.sip
diff --git a/sip/tdeio/kemailsettings.sip b/sip/tdeio/kemailsettings.sip
index 20635b6..f63c99b 100644
--- a/sip/tdeio/kemailsettings.sip
+++ b/sip/tdeio/kemailsettings.sip
@@ -27,7 +27,7 @@
 class KEMailSettings
 {
 %TypeHeaderCode
-#include <kemailsettings.h>
+#include <tdeemailsettings.h>
 %End
 
 
diff --git a/sip/tdeio/kprotocolmanager.sip b/sip/tdeio/kprotocolmanager.sip
index e1afd9b..0170aa0 100644
--- a/sip/tdeio/kprotocolmanager.sip
+++ b/sip/tdeio/kprotocolmanager.sip
@@ -27,7 +27,7 @@
 class KProtocolManager
 {
 %TypeHeaderCode
-#include <kprotocolmanager.h>
+#include <tdeprotocolmanager.h>
 %End
 
 
diff --git a/sip/tdeio/tdeiomod.sip.in b/sip/tdeio/tdeiomod.sip.in
index 800c0b7..17d91ff 100644
--- a/sip/tdeio/tdeiomod.sip.in
+++ b/sip/tdeio/tdeiomod.sip.in
@@ -48,7 +48,7 @@
 %Include kdirlister.sip
 %Include kdirnotify.sip
 %Include kdirwatch.sip
-%Include kemailsettings.sip
+%Include tdeemailsettings.sip
 %Include tdefilefilter.sip
 %Include tdefileitem.sip
 %Include tdefilemetainfo.sip
@@ -58,7 +58,7 @@
 %Include kmimemagic.sip
 %Include kmimetype.sip
 %Include kprotocolinfo.sip
-%Include kprotocolmanager.sip
+%Include tdeprotocolmanager.sip
 %Include krun.sip
 %Include kscan.sip
 %Include kservice.sip
diff --git a/sip/tdeui/kmenubar.sip b/sip/tdeui/kmenubar.sip
index 0ff0b58..8027757 100644
--- a/sip/tdeui/kmenubar.sip
+++ b/sip/tdeui/kmenubar.sip
@@ -27,7 +27,7 @@
 class KMenuBar : TQMenuBar
 {
 %TypeHeaderCode
-#include <kmenubar.h>
+#include <tdemenubar.h>
 %End
 
 
diff --git a/sip/tdeui/kmessagebox.sip b/sip/tdeui/kmessagebox.sip
index 68a1bcd..b5a75fc 100644
--- a/sip/tdeui/kmessagebox.sip
+++ b/sip/tdeui/kmessagebox.sip
@@ -27,7 +27,7 @@
 class KMessageBox
 {
 %TypeHeaderCode
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 %End
 
 
diff --git a/sip/tdeui/tdeuimod.sip.in b/sip/tdeui/tdeuimod.sip.in
index a8d915d..1985230 100644
--- a/sip/tdeui/tdeuimod.sip.in
+++ b/sip/tdeui/tdeuimod.sip.in
@@ -82,8 +82,8 @@
 %Include tdelistview.sip
 %Include tdemainwindow.sip
 %Include tdemainwindowiface.sip
-%Include kmenubar.sip
-%Include kmessagebox.sip
+%Include tdemenubar.sip
+%Include tdemessagebox.sip
 %Include knuminput.sip
 %Include knumvalidator.sip
 %Include kpanelapplet.sip