diff --git a/kdict/applet/kdictapplet.desktop b/kdict/applet/kdictapplet.desktop
index 23d26f3f..d8601c58 100644
--- a/kdict/applet/kdictapplet.desktop
+++ b/kdict/applet/kdictapplet.desktop
@@ -63,7 +63,7 @@ Comment[tr]=Sözlükten kelimelere bakın
 Comment[uk]=Пошук фраз у словнику
 Comment[ven]=Todani fhungo kha bugu talutshedza maipfi
 Comment[wa]=Cweri des fråzes dins on diccionaire
-Comment[xh]=Jonga amabinzana kwincwadi enekcazelo zamagama
+Comment[xh]=Jonga amabinzana twincwadi enekcazelo zamagama
 Comment[zh_CN]=在字典中查找短语
 Comment[zh_HK]=在字典中尋找片語
 Comment[zh_TW]=在字典中尋找片語
diff --git a/kdict/application.cpp b/kdict/application.cpp
index b4239929..e2a2c2f6 100644
--- a/kdict/application.cpp
+++ b/kdict/application.cpp
@@ -9,7 +9,7 @@
 
  ------------------------------------------------------------- */
 
-#include <kwin.h>
+#include <twin.h>
 #include <kdebug.h>
 #include <kcmdlineargs.h>
 
diff --git a/kdict/toplevel.cpp b/kdict/toplevel.cpp
index 91070af8..fb19461f 100644
--- a/kdict/toplevel.cpp
+++ b/kdict/toplevel.cpp
@@ -21,7 +21,7 @@
 #include <kapplication.h>
 #include <kstatusbar.h>
 #include <klocale.h>
-#include <kwin.h>
+#include <twin.h>
 #include <kedittoolbar.h>
 #include <kdebug.h>
 #include <dcopclient.h>
diff --git a/kget/droptarget.cpp b/kget/droptarget.cpp
index 5bc91256..78bad0b4 100644
--- a/kget/droptarget.cpp
+++ b/kget/droptarget.cpp
@@ -32,7 +32,7 @@
 #include <kiconloader.h>
 #include <kglobalsettings.h>
 #include <kmainwindow.h>
-#include <kwin.h>
+#include <twin.h>
 #include <klocale.h>
 #include <kpopupmenu.h>
 #include <kurldrag.h>
diff --git a/kget/kmainwidget.cpp b/kget/kmainwidget.cpp
index aa65437e..ad5fa4a9 100644
--- a/kget/kmainwidget.cpp
+++ b/kget/kmainwidget.cpp
@@ -58,7 +58,7 @@
 #include <kurldrag.h>
 #include <klocale.h>
 #include <kglobal.h>
-#include <kwin.h>
+#include <twin.h>
 #include <kmessagebox.h>
 #include <kstdaction.h>
 #include <khelpmenu.h>
diff --git a/kget/main.cpp b/kget/main.cpp
index 68f07c60..f1499e06 100644
--- a/kget/main.cpp
+++ b/kget/main.cpp
@@ -25,7 +25,7 @@
  ***************************************************************************/
 
 
-#include <kwin.h>
+#include <twin.h>
 #include <klocale.h>
 #include <kaboutdata.h>
 #include <kcmdlineargs.h>
diff --git a/kget/settings.cpp b/kget/settings.cpp
index 4329dfc8..66bc73f6 100644
--- a/kget/settings.cpp
+++ b/kget/settings.cpp
@@ -28,7 +28,7 @@
 #include <kglobal.h>
 #include <kconfig.h>
 #include <klocale.h>
-#include <kwin.h>
+#include <twin.h>
 #include <kmessagebox.h>
 #include <kglobalsettings.h>
 #include <netwm_def.h>
diff --git a/kget/settings.h b/kget/settings.h
index aeaaba98..2571801d 100644
--- a/kget/settings.h
+++ b/kget/settings.h
@@ -88,7 +88,7 @@ extern TQString ConnectionDevices[];
 
 #include <tqdatetime.h>
 
-#include <kwin.h>
+#include <twin.h>
 #include <tqvaluelist.h>
 struct DirItem
 {
diff --git a/kget/transfer.cpp b/kget/transfer.cpp
index 22a5b8ad..36ce7887 100644
--- a/kget/transfer.cpp
+++ b/kget/transfer.cpp
@@ -32,7 +32,7 @@
 #include <kaction.h>
 #include <kiconloader.h>
 #include <kstandarddirs.h>
-#include <kwin.h>
+#include <twin.h>
 #include <kmessagebox.h>
 
 #include <assert.h>
diff --git a/kopete/kopete/chatwindow/chatview.cpp b/kopete/kopete/chatwindow/chatview.cpp
index 0ec5e8ad..f2b80969 100644
--- a/kopete/kopete/chatwindow/chatview.cpp
+++ b/kopete/kopete/chatwindow/chatview.cpp
@@ -39,7 +39,7 @@
 #include <kmessagebox.h>
 #include <kpopupmenu.h>
 #include <kstringhandler.h>
-#include <kwin.h>
+#include <twin.h>
 #include <kurldrag.h>
 #include <kglobalsettings.h>
 #include <kgenericfactory.h>
diff --git a/kopete/kopete/chatwindow/kopetechatwindow.cpp b/kopete/kopete/chatwindow/kopetechatwindow.cpp
index f2dbd24a..f8cf09b2 100644
--- a/kopete/kopete/chatwindow/kopetechatwindow.cpp
+++ b/kopete/kopete/chatwindow/kopetechatwindow.cpp
@@ -34,7 +34,7 @@
 #include <kpopupmenu.h>
 #include <kiconloader.h>
 #include <kdebug.h>
-#include <kwin.h>
+#include <twin.h>
 #include <ktempfile.h>
 #include <kkeydialog.h>
 #include <kedittoolbar.h>
diff --git a/kopete/kopete/chatwindow/kopeteemailwindow.cpp b/kopete/kopete/chatwindow/kopeteemailwindow.cpp
index f278b255..12772ddb 100644
--- a/kopete/kopete/chatwindow/kopeteemailwindow.cpp
+++ b/kopete/kopete/chatwindow/kopeteemailwindow.cpp
@@ -51,7 +51,7 @@
 #include <kpopupmenu.h>
 #include <kpushbutton.h>
 #include <ktextedit.h>
-#include <kwin.h>
+#include <twin.h>
 #include <kgenericfactory.h>
 
 #include <tqlabel.h>
diff --git a/kopete/kopete/contactlist/kopetegrouplistaction.cpp b/kopete/kopete/contactlist/kopetegrouplistaction.cpp
index 9b954951..142e4090 100644
--- a/kopete/kopete/contactlist/kopetegrouplistaction.cpp
+++ b/kopete/kopete/contactlist/kopetegrouplistaction.cpp
@@ -23,7 +23,7 @@
 #include <kguiitem.h>
 #include <klocale.h>
 #include <kaction.h>
-#include <kwin.h>
+#include <twin.h>
 #include <kcmultidialog.h>
 
 #include "kopetecontactlist.h"
diff --git a/kopete/kopete/kopetewindow.cpp b/kopete/kopete/kopetewindow.cpp
index 86fbe897..525744fa 100644
--- a/kopete/kopete/kopetewindow.cpp
+++ b/kopete/kopete/kopetewindow.cpp
@@ -45,7 +45,7 @@
 #include <kmenubar.h>
 #include <kstatusbar.h>
 #include <kglobalaccel.h>
-#include <kwin.h>
+#include <twin.h>
 #include <kdeversion.h>
 #include <kinputdialog.h>
 #include <kplugininfo.h>
diff --git a/kopete/kopete/systemtray.cpp b/kopete/kopete/systemtray.cpp
index 7982d01e..8535f0a0 100644
--- a/kopete/kopete/systemtray.cpp
+++ b/kopete/kopete/systemtray.cpp
@@ -23,7 +23,7 @@
 #include <tqtooltip.h>
 #include <tqregexp.h>
 
-#include <kwin.h>
+#include <twin.h>
 #include <kaboutdata.h>
 #include <kactioncollection.h>
 #include <kapplication.h>
diff --git a/kopete/libkopete/knotification.cpp b/kopete/libkopete/knotification.cpp
index f9418ea2..cd7fa13a 100644
--- a/kopete/libkopete/knotification.cpp
+++ b/kopete/libkopete/knotification.cpp
@@ -30,7 +30,7 @@
 #include <kprocess.h>
 #include <kdialog.h>
 #include <kmacroexpander.h>
-#include <kwin.h>
+#include <twin.h>
 
 
 #include <tqvbox.h>
diff --git a/kopete/libkopete/private/kopeteviewmanager.cpp b/kopete/libkopete/private/kopeteviewmanager.cpp
index 1d6feced..7023729c 100644
--- a/kopete/libkopete/private/kopeteviewmanager.cpp
+++ b/kopete/libkopete/private/kopeteviewmanager.cpp
@@ -24,7 +24,7 @@
 #include <kplugininfo.h>
 #include <knotification.h>
 #include <kglobal.h>
-#include <kwin.h>
+#include <twin.h>
 
 #include "kopeteprefs.h"
 #include "kopeteaccount.h"
diff --git a/kopete/libkopete/ui/kopetestdaction.cpp b/kopete/libkopete/ui/kopetestdaction.cpp
index d9a6a632..b1283a79 100644
--- a/kopete/libkopete/ui/kopetestdaction.cpp
+++ b/kopete/libkopete/ui/kopetestdaction.cpp
@@ -27,7 +27,7 @@
 #include <ksettings/dialog.h>
 #include <kstdaction.h>
 #include <kstdguiitem.h>
-#include <kwin.h>
+#include <twin.h>
 #include <kcmultidialog.h>
 
 #include "kopetecontactlist.h"
diff --git a/kppp/accounts.cpp b/kppp/accounts.cpp
index fe1424e2..450e2a1b 100644
--- a/kppp/accounts.cpp
+++ b/kppp/accounts.cpp
@@ -36,7 +36,7 @@
 #include <kmessagebox.h>
 #include <klocale.h>
 #include <kglobal.h>
-#include <kwin.h>
+#include <twin.h>
 #include <kdialogbase.h>
 #include <kstdguiitem.h>
 #include <tqvgroupbox.h>
diff --git a/kppp/docking.cpp b/kppp/docking.cpp
index eb544668..d67b6683 100644
--- a/kppp/docking.cpp
+++ b/kppp/docking.cpp
@@ -24,7 +24,7 @@
  * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include <kwin.h>
+#include <twin.h>
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kpopupmenu.h>
diff --git a/kppp/edit.cpp b/kppp/edit.cpp
index ef2eaa10..39f88097 100644
--- a/kppp/edit.cpp
+++ b/kppp/edit.cpp
@@ -36,7 +36,7 @@
 #include <tqvgroupbox.h>
 #include <tqhbox.h>
 #include <kdialog.h>
-#include <kwin.h>
+#include <twin.h>
 
 #include "edit.h"
 #include "pppdata.h"
diff --git a/kppp/kpppwidget.cpp b/kppp/kpppwidget.cpp
index 8b73d393..28afa910 100644
--- a/kppp/kpppwidget.cpp
+++ b/kppp/kpppwidget.cpp
@@ -47,7 +47,7 @@
 #include <kmessagebox.h>
 #include <kseparator.h>
 #include <kstandarddirs.h>
-#include <kwin.h>
+#include <twin.h>
 #include <khelpmenu.h>
 #include <kpushbutton.h>
 #include <kguiitem.h>
diff --git a/kppp/miniterm.cpp b/kppp/miniterm.cpp
index 1ed655c7..db73149f 100644
--- a/kppp/miniterm.cpp
+++ b/kppp/miniterm.cpp
@@ -26,7 +26,7 @@
 #include <sys/ioctl.h>
 #include <termios.h>
 #include <sys/types.h>
-#include <kwin.h>
+#include <twin.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
 #include "pppdata.h"
diff --git a/kppp/modemcmds.cpp b/kppp/modemcmds.cpp
index dae8bd0f..2416e4c5 100644
--- a/kppp/modemcmds.cpp
+++ b/kppp/modemcmds.cpp
@@ -32,7 +32,7 @@
 #include <klocale.h>
 #include "modemcmds.h"
 #include "pppdata.h"
-#include <kwin.h>
+#include <twin.h>
 
 #include <tqgroupbox.h>
 #include <tqlineedit.h>
diff --git a/kppp/modeminfo.cpp b/kppp/modeminfo.cpp
index 8c9f00cd..d242c4f4 100644
--- a/kppp/modeminfo.cpp
+++ b/kppp/modeminfo.cpp
@@ -27,7 +27,7 @@
 #include <unistd.h>
 #include <tqregexp.h>
 #include <tqlayout.h>
-#include <kwin.h>
+#include <twin.h>
 #include <kmessagebox.h>
 #include <kapplication.h>
 #include <kpushbutton.h>
diff --git a/kppp/modems.cpp b/kppp/modems.cpp
index 9cbe6d9a..55f8f629 100644
--- a/kppp/modems.cpp
+++ b/kppp/modems.cpp
@@ -37,7 +37,7 @@
 #include <kmessagebox.h>
 #include <klocale.h>
 #include <kglobal.h>
-#include <kwin.h>
+#include <twin.h>
 #include <kdialogbase.h>
 #include <tqvgroupbox.h>
 
diff --git a/kppp/pppdargs.cpp b/kppp/pppdargs.cpp
index 3b4abc3a..56814f34 100644
--- a/kppp/pppdargs.cpp
+++ b/kppp/pppdargs.cpp
@@ -27,7 +27,7 @@
 
 #include <tqlayout.h>
 #include <kbuttonbox.h>
-#include <kwin.h>
+#include <twin.h>
 #include <kapplication.h>
 #include "pppdargs.h"
 #include "pppdata.h"
diff --git a/kppp/pppstatdlg.cpp b/kppp/pppstatdlg.cpp
index 39c1490d..b5b12f42 100644
--- a/kppp/pppstatdlg.cpp
+++ b/kppp/pppstatdlg.cpp
@@ -25,7 +25,7 @@
 
 #include <tqlayout.h>
 #include <tqpainter.h>
-#include <kwin.h>
+#include <twin.h>
 #include <kiconloader.h>
 #include <kapplication.h>
 #include <klocale.h>
diff --git a/krdc/krdc.cpp b/krdc/krdc.cpp
index e77079db..41d96a70 100644
--- a/krdc/krdc.cpp
+++ b/krdc/krdc.cpp
@@ -31,7 +31,7 @@
 #include <ktoolbarbutton.h>
 #include <kpopupmenu.h>
 #include <kmessagebox.h>
-#include <kwin.h>
+#include <twin.h>
 #include <kstartupinfo.h>
 
 #include <tqdockarea.h>
diff --git a/ksirc/KSTicker/ksticker.cpp b/ksirc/KSTicker/ksticker.cpp
index 7394d3fb..4f3933db 100644
--- a/ksirc/KSTicker/ksticker.cpp
+++ b/ksirc/KSTicker/ksticker.cpp
@@ -18,7 +18,7 @@
 #include "../nickColourMaker.h"
 
 #include <kconfig.h>
-#include <kwin.h>
+#include <twin.h>
 #include <kdebug.h>
 
 KSTicker::KSTicker(TQWidget * parent, const char * name, WFlags f)
@@ -67,7 +67,7 @@ KSTicker::KSTicker(TQWidget * parent, const char * name, WFlags f)
   /*
    * Tell KWM to use only minimum decurations
    */
-  // ### FIXME: port to kwin
+  // ### FIXME: port to twin
   //KWM::setDecoration(winId(), KWM::tinyDecoration);
   //  KWin::setType(winId(), NET::Override);
 
@@ -99,7 +99,7 @@ void KSTicker::show()
   /*
    * Tell KWM to use only minimum decurations
    */
-    // ### FIXME: port to kwin
+    // ### FIXME: port to twin
     //KWM::setDecoration(winId(), KWM::tinyDecoration);
   TQSize size = this->size();
   size.setHeight(TQFontMetrics(font()).height()+10);
diff --git a/ksirc/displayMgrMDI.cpp b/ksirc/displayMgrMDI.cpp
index f2805426..b7bbf16c 100644
--- a/ksirc/displayMgrMDI.cpp
+++ b/ksirc/displayMgrMDI.cpp
@@ -5,7 +5,7 @@
 
 #include <assert.h>
 #include <tqpopupmenu.h>
-#include <kwin.h>
+#include <twin.h>
 #include <kaccel.h>
 #include <kaction.h>
 #include <kapplication.h>
diff --git a/ksirc/dockservercontroller.cpp b/ksirc/dockservercontroller.cpp
index e47d98da..3fe84aa8 100644
--- a/ksirc/dockservercontroller.cpp
+++ b/ksirc/dockservercontroller.cpp
@@ -19,7 +19,7 @@
 #include <kpopupmenu.h>
 #include <klocale.h>
 #include <kaction.h>
-#include <kwin.h>
+#include <twin.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <kpassivepopup.h>
diff --git a/ksirc/servercontroller.cpp b/ksirc/servercontroller.cpp
index 9b3121d0..9ad1b913 100644
--- a/ksirc/servercontroller.cpp
+++ b/ksirc/servercontroller.cpp
@@ -85,7 +85,7 @@
 #include <kconfig.h>
 #include <kfontdialog.h>
 #include <kiconloader.h>
-#include <kwin.h>
+#include <twin.h>
 #include <kdebug.h>
 #include <kstdaccel.h>
 #include <kstandarddirs.h>
diff --git a/ksirc/toplevel.cpp b/ksirc/toplevel.cpp
index bdc14b1d..fa53cded 100644
--- a/ksirc/toplevel.cpp
+++ b/ksirc/toplevel.cpp
@@ -62,7 +62,7 @@
 #include <kmenubar.h>
 #include <kapplication.h>
 #include <kdebug.h>
-#include <kwin.h>
+#include <twin.h>
 #include <knotifyclient.h>
 #include <kpopupmenu.h>
 #include <kmessagebox.h>